372322: [Diagram - Refresh] The refresh action is not correctly binded

to F5
https://bugs.eclipse.org/bugs/show_bug.cgi?id=372322

  - Remove Refresh binding and an Update command creation of generation
engine
  - Remove binding and generated update command from UML diagram
  - Preserve previous generated code of old Update command in Common
Refresh action handler

Change-Id: I75c50ab75859c40e32f98c13f079c16f98eeda46
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>

27 files changed, 13276 insertions, 14463 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java b/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
index 99de3f70922..bccb252287a 100644
--- a/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
+++ b/plugins/developer/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
@@ -1,40 +1,45 @@
-/****************************************************************************

- * Copyright (c) 2008 Atos Origin.

- *

- * 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:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

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

-package org.eclipse.papyrus.codegen;

-

-import org.eclipse.gmf.codegen.xtend.ui.handlers.CodegenEmittersWithXtend2;

-import org.eclipse.gmf.common.UnexpectedBehaviourException;

-import org.eclipse.gmf.internal.common.codegen.JavaClassEmitter;

-

-@SuppressWarnings("restriction")

-public class PapyrusCodegenEmitters extends CodegenEmittersWithXtend2 {

-

-	public PapyrusCodegenEmitters(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {

-		super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);

-	}

-

-	@Override

-	public JavaClassEmitter getModelingAssistantProviderEmitter() throws UnexpectedBehaviourException {

-		return null;

-	}

-

-	@Override

-	public JavaClassEmitter getNodeEditPartModelingAssistantProviderEmitter() {

-		return null;

-	}

-

-	@Override

-	public JavaClassEmitter getDeleteElementActionEmitter() {

-		return null;

-	}

-}

+/****************************************************************************
+ * Copyright (c) 2008 Atos Origin.
+ *
+ * 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:
+ *		Thibault Landre (Atos Origin) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.codegen;
+
+import org.eclipse.gmf.codegen.xtend.ui.handlers.CodegenEmittersWithXtend2;
+import org.eclipse.gmf.common.UnexpectedBehaviourException;
+import org.eclipse.gmf.internal.common.codegen.JavaClassEmitter;
+
+@SuppressWarnings("restriction")
+public class PapyrusCodegenEmitters extends CodegenEmittersWithXtend2 {
+
+	public PapyrusCodegenEmitters(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
+		super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);
+	}
+
+	@Override
+	public JavaClassEmitter getModelingAssistantProviderEmitter() throws UnexpectedBehaviourException {
+		return null;
+	}
+
+	@Override
+	public JavaClassEmitter getUpdateCommandEmitter() {
+		return null;
+	}
+
+	@Override
+	public JavaClassEmitter getNodeEditPartModelingAssistantProviderEmitter() {
+		return null;
+	}
+
+	@Override
+	public JavaClassEmitter getDeleteElementActionEmitter() {
+		return null;
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
index 3819cbf1bdf..fd5fcc747d8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend-gen/aspects/xpt/diagram/updater/.gitignore
@@ -1,2 +1,2 @@
 /DiagramUpdater.java
-/UpdateCommand.java
+/Extensions.java
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend
new file mode 100644
index 00000000000..caf2ddec7ba
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/Extensions.xtend
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2007, 2009 Borland Software Corporation
+ * 
+ * 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:
+ *    Alexander Shatalin (Borland) - initial API and implementation
+ * 	  Gabriel Pascual (ALL4TEC) -  Bug 372322
+ */
+package aspects.xpt.diagram.updater
+
+import com.google.inject.Singleton
+import org.eclipse.gmf.codegen.gmfgen.GenDiagramUpdater
+
+@Singleton class Extensions extends xpt.diagram.updater.extensions{
+	
+	override def extensions(GenDiagramUpdater it) {
+		// Override Refresh contribution
+	}
+	
+}
+
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/UpdateCommand.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/UpdateCommand.xtend
deleted file mode 100644
index e8238331560..00000000000
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/updater/UpdateCommand.xtend
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2007, 2009, 2013 Borland Software Corporation and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- */
-package aspects.xpt.diagram.updater

-

-import com.google.inject.Inject

-import com.google.inject.Singleton

-import org.eclipse.gmf.codegen.gmfgen.GenDiagramUpdater

-import xpt.Common

-

-@Singleton class UpdateCommand extends xpt.diagram.updater.UpdateCommand {
-	@Inject extension Common;
-
-
-
-	override def execute(GenDiagramUpdater it) '''
-		«generatedMemberComment»
-		public Object execute(org.eclipse.core.commands.ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
-			org.eclipse.jface.viewers.ISelection selection = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
-			if (selection instanceof org.eclipse.jface.viewers.IStructuredSelection) {
-				org.eclipse.jface.viewers.IStructuredSelection structuredSelection = (org.eclipse.jface.viewers.IStructuredSelection) selection;
-				if (structuredSelection.size() != 1) {
-					return null;
-				}
-				if (structuredSelection.getFirstElement() instanceof org.eclipse.gef.EditPart && ((org.eclipse.gef.EditPart) structuredSelection.getFirstElement()).getModel() instanceof org.eclipse.gmf.runtime.notation.View) {
-					org.eclipse.emf.ecore.EObject modelElement = ((org.eclipse.gmf.runtime.notation.View) ((org.eclipse.gef.EditPart) structuredSelection.getFirstElement()).getModel()).getElement();
-					java.util.List<?> editPolicies = org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
-					for (java.util.Iterator<?> it = editPolicies.iterator(); it.hasNext();) {
-						org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy nextEditPolicy = (org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy) it.next();
-						nextEditPolicy.refresh();
-					}
-					
-				}
-			}
-			return null;
-		}
-	'''
-}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
index ace0a66f992..938447a9745 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
@@ -1,90 +1,128 @@
-/*****************************************************************************

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

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.infra.gmfdiag.common.handler;

-

-import java.lang.ref.WeakReference;

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedList;

-

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

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

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

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

-import org.eclipse.papyrus.infra.core.services.ServiceException;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.ui.IEditorPart;

-

-/**

- * Handles the refresh command on the Papyrus editor (F5)

- *

- * Refreshes the active diagram

- *

- * @author Camille Letavernier

- */

-// TODO: To be refactored. Move to infra/gmfdiag/menu when the plugin exists

-public class RefreshHandler extends AbstractHandler {

-

-	/**

-	 * The registry of refresh handler parts that are NOT specific to an editor

-	 * We use weak references so that we do not block the garbage collection of objects

-	 */

-	private static Collection<WeakReference<IRefreshHandlerPart>> PARTS = new LinkedList<WeakReference<IRefreshHandlerPart>>();

-

-	/**

-	 * Register a refresher part that is not attached to any editor

-	 *

-	 * @param refresher

-	 *            The refresher part

-	 */

-	public static synchronized void register(IRefreshHandlerPart refresher) {

-		PARTS.add(new WeakReference<IRefreshHandlerPart>(refresher));

-	}

-

-	/**

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		IEditorPart activeEditor;

-		try {

-			activeEditor = ServiceUtilsForHandlers.getInstance().getService(IMultiDiagramEditor.class, event);

-		} catch (ServiceException ex) {

-			Activator.log.error(ex);

-			return null;

-		}

-

-		// Hooks must be called before the actual refresh, because they typically reset cache

-		// Call the relevant hooks

-		callRefresherHooks(activeEditor);

-

-		// Refresh the base GMF objects

-		DiagramHelper.refresh(activeEditor);

-

-		return null;

-	}

-

-	private synchronized void callRefresherHooks(IEditorPart activeEditor) {

-		Iterator<WeakReference<IRefreshHandlerPart>> iterator = PARTS.iterator();

-		while (iterator.hasNext()) {

-			WeakReference<IRefreshHandlerPart> wr = iterator.next();

-			IRefreshHandlerPart part = wr.get();

-			if (part != null) {

-				part.refresh(activeEditor);

-			} else {

-				iterator.remove();

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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:
+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *  Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 372322
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.handler;
+
+import java.lang.ref.WeakReference;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Handles the refresh command on the Papyrus editor (F5)
+ *
+ * Refreshes the active diagram
+ *
+ * @author Camille Letavernier
+ */
+// TODO: To be refactored. Move to infra/gmfdiag/menu when the plugin exists
+public class RefreshHandler extends AbstractHandler {
+
+	/**
+	 * The registry of refresh handler parts that are NOT specific to an editor
+	 * We use weak references so that we do not block the garbage collection of objects
+	 */
+	private static Collection<WeakReference<IRefreshHandlerPart>> PARTS = new LinkedList<WeakReference<IRefreshHandlerPart>>();
+
+	/**
+	 * Register a refresher part that is not attached to any editor
+	 *
+	 * @param refresher
+	 *            The refresher part
+	 */
+	public static synchronized void register(IRefreshHandlerPart refresher) {
+		PARTS.add(new WeakReference<IRefreshHandlerPart>(refresher));
+	}
+
+	/**
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		IEditorPart activeEditor;
+		try {
+			activeEditor = ServiceUtilsForHandlers.getInstance().getService(IMultiDiagramEditor.class, event);
+		} catch (ServiceException ex) {
+			Activator.log.error(ex);
+			return null;
+		}
+
+		updateUMLDiagram();
+
+		// Hooks must be called before the actual refresh, because they typically reset cache
+		// Call the relevant hooks
+		callRefresherHooks(activeEditor);
+
+		// Refresh the base GMF objects
+		DiagramHelper.refresh(activeEditor);
+
+		return null;
+	}
+
+	/**
+	 * Update UML diagram with canonical policy.
+	 * 
+	 * <p>
+	 * This implementation comes from refactor of Generated code for the Bug 372322. It was generated in an update command to refresh current diagram.
+	 * </p>
+	 */
+	private void updateUMLDiagram() {
+		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
+		if (selection instanceof IStructuredSelection) {
+			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			if (structuredSelection.size() != 1) {
+
+
+				if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {
+					EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();
+					List<CanonicalEditPolicy> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
+					for (Iterator<CanonicalEditPolicy> it = editPolicies.iterator(); it.hasNext();) {
+						CanonicalEditPolicy nextEditPolicy = it.next();
+						nextEditPolicy.refresh();
+					}
+				}
+			}
+		}
+	}
+
+	private synchronized void callRefresherHooks(IEditorPart activeEditor) {
+		Iterator<WeakReference<IRefreshHandlerPart>> iterator = PARTS.iterator();
+		while (iterator.hasNext()) {
+			WeakReference<IRefreshHandlerPart> wr = iterator.next();
+			IRefreshHandlerPart part = wr.get();
+			if (part != null) {
+				part.refresh(activeEditor);
+			} else {
+				iterator.remove();
+			}
+		}
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index ba5ea39ced4..37ba3c62173 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2009, 2014 CEA and others.

- 

- All rights reserved. This program and the accompanying materials

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

- which accompanies this distribution, and is available at

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

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2009, 2014 CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+
    <extension point="org.eclipse.ui.contexts" id="ui-context">
       <?gmfgen generated="true"?>
       <context
@@ -24,87 +24,87 @@
          parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
       </context>
    </extension>
-   

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

-      <contributionItemProvider checkPluginLoaded="false" class="org.eclipse.papyrus.uml.diagram.activity.providers.ActivityDiagramContributionItemProvider">

-      <Priority name="Low"/>

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

-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart" policyClass="org.eclipse.papyrus.uml.diagram.activity.providers.ActivityDiagramContributionPolicyClass"/>

-            <popupAction id="papyrus.restoreRelatedLinksAction" path="/navigateMenu/additions"/>

-         </popupContribution>

-      </contributionItemProvider>

-   </extension>

-   

-   <extension

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

-      <command

-            description="Create a new Activity Diagram"

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

-            id="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"

-            name="Create a new Activity Diagram">

-      </command>

-   </extension>

-   

-   

-

-

-   <extension

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

-      <editorDiagram

-            contextId="com.cea.papyrus.gmf.editor.context"

-            factoryClass="org.eclipse.papyrus.uml.diagram.activity.ActivityDiagramEditorFactory"

-            icon="icons/obj16/Diagram_Activity.gif">

-      </editorDiagram>

-      <creationCommand

-            creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"

-            creationCondition="org.eclipse.papyrus.uml.diagram.activity.ActivityDiagramCreationCondition"

-            icon="icons/obj16/Diagram_Activity.gif"

-            language="uml"

-            id="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"

-            label="UML Activity Diagram">

-      </creationCommand>

-   </extension>

-   	

-

-   <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">

-		<modelingAssistantProvider

-			class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLModelingAssistantProvider">

-			<Priority 

-				name="Lowest">

-			</Priority>

-		</modelingAssistantProvider>

-   </extension>

-

-	<?gmfgen generated="true"?>

-

-	<?gmfgen generated="true"?>

-

-   <extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-      <page

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-            name="PapyrusUMLActivityDiagram Diagram"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramGeneralPreferencePage">

-      </page>

+   
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
+      <contributionItemProvider checkPluginLoaded="false" class="org.eclipse.papyrus.uml.diagram.activity.providers.ActivityDiagramContributionItemProvider">
+      <Priority name="Low"/>
+         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart" policyClass="org.eclipse.papyrus.uml.diagram.activity.providers.ActivityDiagramContributionPolicyClass"/>
+            <popupAction id="papyrus.restoreRelatedLinksAction" path="/navigateMenu/additions"/>
+         </popupContribution>
+      </contributionItemProvider>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="Create a new Activity Diagram"
+            categoryId="org.eclipse.papyrus.editor.category"            
+            id="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"
+            name="Create a new Activity Diagram">
+      </command>
+   </extension>
+   
+   
+
+
+   <extension
+         point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+      <editorDiagram
+            contextId="com.cea.papyrus.gmf.editor.context"
+            factoryClass="org.eclipse.papyrus.uml.diagram.activity.ActivityDiagramEditorFactory"
+            icon="icons/obj16/Diagram_Activity.gif">
+      </editorDiagram>
+      <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"
+            creationCondition="org.eclipse.papyrus.uml.diagram.activity.ActivityDiagramCreationCondition"
+            icon="icons/obj16/Diagram_Activity.gif"
+            language="uml"
+            id="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand"
+            label="UML Activity Diagram">
+      </creationCommand>
+   </extension>
+   	
+
+   <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
+		<modelingAssistantProvider
+			class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLModelingAssistantProvider">
+			<Priority 
+				name="Lowest">
+			</Priority>
+		</modelingAssistantProvider>
+   </extension>
+
+	<?gmfgen generated="true"?>
+
+	<?gmfgen generated="true"?>
+
+   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+      <page
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"
+            name="PapyrusUMLActivityDiagram Diagram"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramGeneralPreferencePage">
+      </page>
       
 
 
-      <page

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPrintingPreferencePage"

-            name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPrintingPreferencePage">

-      </page>

+      <page
+            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPrintingPreferencePage"
+            name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"
+            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPrintingPreferencePage">
+      </page>
 
-      <page

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramRulersAndGridPreferencePage"

-            name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramRulersAndGridPreferencePage">

-      </page>

+      <page
+            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramRulersAndGridPreferencePage"
+            name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"
+            class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramRulersAndGridPreferencePage">
+      </page>
 
-   </extension>

+   </extension>
 
    <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
       <?gmfgen generated="true"?>
@@ -168,18 +168,18 @@
          </propertySection>
       </propertySections>
    </extension>
-

-

-<?gmfgen generated="true"?>

-

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

-		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPreferenceInitializer"/>

-	</extension>

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

-		<?gmfgen generated="false"?>

-		<initializer class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramSpecificPreferenceInitializer"/>

-	</extension>

+
+
+<?gmfgen generated="true"?>
+
+	<extension point="org.eclipse.core.runtime.preferences">
+		<?gmfgen generated="true"?>
+		<initializer class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramPreferenceInitializer"/>
+	</extension>
+	<extension point="org.eclipse.core.runtime.preferences">
+		<?gmfgen generated="false"?>
+		<initializer class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramSpecificPreferenceInitializer"/>
+	</extension>
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
       <?gmfgen generated="true"?>
       <viewProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLViewProvider">
@@ -1360,7 +1360,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.activity.ConstraintConstrainedElement_4007"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
          <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/>
       </binding>
    </extension>
@@ -1477,24 +1477,7 @@
          </selectionEnablement>
       </linkHelper>
    </extension>
-   <extension point="org.eclipse.ui.commands" id="update-cmd">
-      <?gmfgen generated="true"?>
-      <command
-         categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdateCommand"
-         description="%update.diagram.description"
-         id="org.eclipse.papyrus.uml.diagram.activity.updateDiagram"
-         name="%update.diagram.name"/>
-   </extension>
    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
-      <?gmfgen generated="true"?>
-      <key 
-         commandId="org.eclipse.papyrus.uml.diagram.activity.updateDiagram"
-         contextId="org.eclipse.papyrus.uml.diagram.activity.ui.diagramContext"
-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-         sequence="F5"/>
-   </extension>
 
    <extension point="org.eclipse.ui.menus" id="context-menus">
       <?gmfgen generated="true"?>
@@ -1528,19 +1511,19 @@
    <extension point="org.eclipse.ui.handlers" id="menu-handlers">
       <?gmfgen generated="true"?>
    </extension>
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-      <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLMarkerNavigationProvider">

-         <MarkerType name="org.eclipse.papyrus.uml.diagram.activity.diagnostic"/>

-         <Priority name="Lowest"/>

-      </MarkerNavigationProvider>

-   </extension>

-

-<extension id="diagnostic" name="Papyrus activity editor Plugin problems" point="org.eclipse.core.resources.markers">

-      <?gmfgen generated="true"?>

-      <super type="org.eclipse.core.resources.problemmarker"/>

-      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-      <persistent value="true"/>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+      <?gmfgen generated="true"?>
+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLMarkerNavigationProvider">
+         <MarkerType name="org.eclipse.papyrus.uml.diagram.activity.diagnostic"/>
+         <Priority name="Lowest"/>
+      </MarkerNavigationProvider>
+   </extension>
+
+<extension id="diagnostic" name="Papyrus activity editor Plugin problems" point="org.eclipse.core.resources.markers">
+      <?gmfgen generated="true"?>
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+      <persistent value="true"/>
    </extension><extension point="org.eclipse.emf.validation.constraintProviders">
       <?gmfgen generated="true"?>
             <category id="org.eclipse.uml2.uml.util.UMLValidator.validate" mandatory="false" name="validateUMLModel">
@@ -1717,8 +1700,8 @@
             name="validateNotUnique"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[-- must be applied on corresponding parameter, if only it exists

-true

+            <![CDATA[-- must be applied on corresponding parameter, if only it exists
+true
 --not self.isUnique]]>
             <description><![CDATA[Object nodes are not unique typed elements]]></description>
             <message><![CDATA[isUnique must be false for object nodes.]]></message>
@@ -1729,9 +1712,9 @@ true
             name="validateSelectionBehavior"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[-- must be applied on corresponding parameter, if only it exists

-true

---((not self.selection.oclIsUndefined()) implies self.isOrdered) and

+            <![CDATA[-- must be applied on corresponding parameter, if only it exists
+true
+--((not self.selection.oclIsUndefined()) implies self.isOrdered) and
 --(self.isOrdered implies (not self.selection.oclIsUndefined()))]]>
             <description><![CDATA[If an object node has a selection behavior, then the ordering of the object node is ordered, and vice versa.]]></description>
             <message><![CDATA[isOrdered means there is a selection behavior for object nodes.]]></message>
@@ -1742,7 +1725,7 @@ true
             name="validateObjectFlowEdges"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[true

+            <![CDATA[true
 -- Already checked by validateControlFlow_validateObjectNodes]]>
             <description><![CDATA[All edges coming into or going out of object nodes must be object flow edges.]]></description>
             <message><![CDATA[All edges coming into or going out of object nodes must be object flow edges.]]></message>
@@ -1791,7 +1774,7 @@ true
             name="validateOneOutputPin"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.fromAction.oclIsUndefined()) implies

+            <![CDATA[(not self.fromAction.oclIsUndefined()) implies
 self.fromAction.output->size() = 1]]>
             <description><![CDATA[The fromAction of an action input pin must have exactly one output pin.]]></description>
             <message><![CDATA[The fromAction of an action input pin must have exactly one output pin.]]></message>
@@ -1802,7 +1785,7 @@ self.fromAction.output->size() = 1]]>
             name="validateInputPin"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.fromAction.oclIsUndefined()) implies

+            <![CDATA[(not self.fromAction.oclIsUndefined()) implies
 self.fromAction.input->forAll(oclIsKindOf(ActionInputPin))]]>
             <description><![CDATA[The fromAction of an action input pin must only have action input pins as input pins.]]></description>
             <message><![CDATA[The fromAction of an action input pin must only have action input pins as input pins.]]></message>
@@ -1813,9 +1796,9 @@ self.fromAction.input->forAll(oclIsKindOf(ActionInputPin))]]>
             name="validateNoControlOrDataFlow"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.fromAction.oclIsUndefined()) implies

-(self.fromAction.incoming->isEmpty() and self.fromAction.outgoing->isEmpty()

-and self.fromAction.input->forAll(incoming->isEmpty() and outgoing->isEmpty())

+            <![CDATA[(not self.fromAction.oclIsUndefined()) implies
+(self.fromAction.incoming->isEmpty() and self.fromAction.outgoing->isEmpty()
+and self.fromAction.input->forAll(incoming->isEmpty() and outgoing->isEmpty())
 and self.fromAction.output->forAll(incoming->isEmpty() and outgoing->isEmpty()))]]>
             <description><![CDATA[The fromAction of an action input pin cannot have control or data flows coming into or out of it or its pins.]]></description>
             <message><![CDATA[The fromAction of an action input pin cannot have control or data flows coming into or out of it or its pins.]]></message>
@@ -1872,7 +1855,7 @@ and self.fromAction.output->forAll(incoming->isEmpty() and outgoing->isEmpty()))
             name="validateOwned"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[self.owner.oclIsKindOf(Activity)

+            <![CDATA[self.owner.oclIsKindOf(Activity)
 or self.owner.oclIsKindOf(ActivityGroup)]]>
             <description><![CDATA[Activity edges may be owned only by activities or groups.]]></description>
             <message><![CDATA[Activity edges may be owned only by activities or groups.]]></message>
@@ -1883,7 +1866,7 @@ or self.owner.oclIsKindOf(ActivityGroup)]]>
             name="validateStructuredNode"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[true

+            <![CDATA[true
 -- constraint is checked by the model structure]]>
             <description><![CDATA[Activity edges may be owned by at most one structured node.]]></description>
             <message><![CDATA[Activity edges may be owned by at most one structured node.]]></message>
@@ -1894,8 +1877,8 @@ or self.owner.oclIsKindOf(ActivityGroup)]]>
             name="validateHasSourceAndTarget"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[-- This constraint is implemented separately for not being in live mode.

--- Other constraints have been relaxed to supprot null source and target

+            <![CDATA[-- This constraint is implemented separately for not being in live mode.
+-- Other constraints have been relaxed to supprot null source and target
 not self.source.oclIsUndefined() and not self.target.oclIsUndefined()]]>
             <description><![CDATA[The source and target of an edge must be defined.]]></description>
             <message><![CDATA[The source and target of an edge must be defined.]]></message>
@@ -1918,7 +1901,7 @@ not self.source.oclIsUndefined() and not self.target.oclIsUndefined()]]>
             name="validateNoActions"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.source.oclIsUndefined() or not self.source.oclIsKindOf(Action))

+            <![CDATA[(self.source.oclIsUndefined() or not self.source.oclIsKindOf(Action))
 and (self.target.oclIsUndefined() or not self.target.oclIsKindOf(Action))]]>
             <description><![CDATA[Object flows may not have actions at either end.]]></description>
             <message><![CDATA[You can not link an action with an object flow]]></message>
@@ -2001,13 +1984,13 @@ and (self.target.oclIsUndefined() or not self.target.oclIsKindOf(Action))]]>
             name="validateObjectNodes"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.source.oclIsUndefined() or

-	(self.source.oclIsKindOf(ObjectNode) implies

-	self.source.oclAsType(ObjectNode).isControlType)

-) and

-(self.target.oclIsUndefined() or

-	(self.target.oclIsKindOf(ObjectNode) implies

-	self.target.oclAsType(ObjectNode).isControlType)

+            <![CDATA[(self.source.oclIsUndefined() or
+	(self.source.oclIsKindOf(ObjectNode) implies
+	self.source.oclAsType(ObjectNode).isControlType)
+) and
+(self.target.oclIsUndefined() or
+	(self.target.oclIsKindOf(ObjectNode) implies
+	self.target.oclAsType(ObjectNode).isControlType)
 )]]>
             <description><![CDATA[Control flows may not have object nodes at either end, except for object nodes with control type]]></description>
             <message><![CDATA[You can not link an object node with a control flow (except if its control type is true).]]></message>
@@ -2020,8 +2003,8 @@ and (self.target.oclIsUndefined() or not self.target.oclIsKindOf(Action))]]>
             name="validateIncomingOutgoingEdges"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[self.outgoing->size() > 0 and

-self.incoming->size() > 0 and

+            <![CDATA[self.outgoing->size() > 0 and
+self.incoming->size() > 0 and
 self.incoming->size() <= 2]]>
             <description><![CDATA[A decision node has one or two incoming edges and at least one outgoing edge.]]></description>
             <message><![CDATA[A decision node has one or two incoming edges and at least one outgoing edge.]]></message>
@@ -2032,9 +2015,9 @@ self.incoming->size() <= 2]]>
             name="validateEdges"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.incoming->reject(i | i = self.decisionInputFlow)->forAll(oclIsKindOf(ObjectFlow)) and

- self.outgoing->forAll(oclIsKindOf(ObjectFlow)) ) or

-(self.incoming->reject(i | i = self.decisionInputFlow)->forAll(oclIsKindOf(ControlFlow)) and

+            <![CDATA[(self.incoming->reject(i | i = self.decisionInputFlow)->forAll(oclIsKindOf(ObjectFlow)) and
+ self.outgoing->forAll(oclIsKindOf(ObjectFlow)) ) or
+(self.incoming->reject(i | i = self.decisionInputFlow)->forAll(oclIsKindOf(ControlFlow)) and
  self.outgoing->forAll(oclIsKindOf(ControlFlow)) )]]>
             <description><![CDATA[The edges coming into and out of a decision node, other than the decision input flow (if any), must be either all object flows or all control flows.]]></description>
             <message><![CDATA[Edges linking the decision node must have be of the same type (except decision input flow).]]></message>
@@ -2045,7 +2028,7 @@ self.incoming->size() <= 2]]>
             name="validateDecisionInputFlowIncoming"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.decisionInputFlow.oclIsUndefined()) implies

+            <![CDATA[(not self.decisionInputFlow.oclIsUndefined()) implies
 self.incoming->includes(self.decisionInputFlow)]]>
             <description><![CDATA[The decisionInputFlow of a decision node must be an incoming edge of the decision node.]]></description>
             <message><![CDATA[The decisionInputFlow of a decision node must be an incoming edge of the decision node.]]></message>
@@ -2056,12 +2039,12 @@ self.incoming->includes(self.decisionInputFlow)]]>
             name="validateParameters"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.decisionInput.oclIsUndefined()) implies (

-self.decisionInput.ownedParameter->select(

- direction = ParameterDirectionKind::out or

- direction = ParameterDirectionKind::inout)->size() = 0

-and self.decisionInput.ownedParameter->select(

- direction = ParameterDirectionKind::return)->size() = 1

+            <![CDATA[(not self.decisionInput.oclIsUndefined()) implies (
+self.decisionInput.ownedParameter->select(
+ direction = ParameterDirectionKind::out or
+ direction = ParameterDirectionKind::inout)->size() = 0
+and self.decisionInput.ownedParameter->select(
+ direction = ParameterDirectionKind::return)->size() = 1
 )]]>
             <description><![CDATA[A decision input behavior has no output parameters, no in-out parameters and one return parameter.]]></description>
             <message><![CDATA[A decision input behavior has no output parameters, no in-out parameters and one return parameter.]]></message>
@@ -2072,12 +2055,12 @@ and self.decisionInput.ownedParameter->select(
             name="validateZeroInputParameters"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(not self.decisionInput.oclIsUndefined()) implies (

-  (self.decisionInputFlow.oclIsUndefined() and

-   self.incoming->select(i | i.oclIsKindOf(ControlFlow))->size() = 1

-  ) implies

-  self.decisionInput.ownedParameter->select(

-    direction = ParameterDirectionKind::_in)->size() = 0

+            <![CDATA[(not self.decisionInput.oclIsUndefined()) implies (
+  (self.decisionInputFlow.oclIsUndefined() and
+   self.incoming->select(i | i.oclIsKindOf(ControlFlow))->size() = 1
+  ) implies
+  self.decisionInput.ownedParameter->select(
+    direction = ParameterDirectionKind::_in)->size() = 0
 )]]>
             <description><![CDATA[If the decision node has no decision input flow and an incoming control flow, then a decision input behavior has zero input parameters.]]></description>
             <message><![CDATA[If the decision node has no decision input flow and an incoming control flow, then a decision input behavior has zero input parameters.]]></message>
@@ -2130,9 +2113,9 @@ and self.decisionInput.ownedParameter->select(
             name="validateEdges"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.outgoing->exists(e | e.oclIsKindOf(ObjectFlow)) implies

- self.incoming->forAll(e | e.oclIsKindOf(ObjectFlow))) and

-(self.outgoing->exists(e | e.oclIsKindOf(ControlFlow)) implies

+            <![CDATA[(self.outgoing->exists(e | e.oclIsKindOf(ObjectFlow)) implies
+ self.incoming->forAll(e | e.oclIsKindOf(ObjectFlow))) and
+(self.outgoing->exists(e | e.oclIsKindOf(ControlFlow)) implies
  self.incoming->forAll(e | e.oclIsKindOf(ControlFlow)))]]>
             <description><![CDATA[The edges coming into and out of a merge node must be either all object flows or all control flows.]]></description>
             <message><![CDATA[The edges coming into and out of a merge node must be either all object flows or all control flows.]]></message>
@@ -2155,9 +2138,9 @@ and self.decisionInput.ownedParameter->select(
             name="validateEdges"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.incoming->exists(e | e.oclIsKindOf(ObjectFlow)) implies

- self.outgoing->forAll(e | e.oclIsKindOf(ObjectFlow))) and

-(self.incoming->exists(e | e.oclIsKindOf(ControlFlow)) implies

+            <![CDATA[(self.incoming->exists(e | e.oclIsKindOf(ObjectFlow)) implies
+ self.outgoing->forAll(e | e.oclIsKindOf(ObjectFlow))) and
+(self.incoming->exists(e | e.oclIsKindOf(ControlFlow)) implies
  self.outgoing->forAll(e | e.oclIsKindOf(ControlFlow)))]]>
             <description><![CDATA[The edges coming into and out of a fork node must be either all object flows or all control flows.]]></description>
             <message><![CDATA[The edges coming into and out of a fork node must be either all object flows or all control flows.]]></message>
@@ -2180,9 +2163,9 @@ and self.decisionInput.ownedParameter->select(
             name="validateIncomingObjectFlow"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.incoming->select(e | e.oclIsKindOf(ObjectFlow))->notEmpty() implies

- self.outgoing->exists(e | e.oclIsKindOf(ObjectFlow))) and

-(self.incoming->select(e | e.oclIsKindOf(ObjectFlow))->isEmpty() implies

+            <![CDATA[(self.incoming->select(e | e.oclIsKindOf(ObjectFlow))->notEmpty() implies
+ self.outgoing->exists(e | e.oclIsKindOf(ObjectFlow))) and
+(self.incoming->select(e | e.oclIsKindOf(ObjectFlow))->isEmpty() implies
  self.outgoing->exists(e | e.oclIsKindOf(ControlFlow)))]]>
             <description><![CDATA[If a join node has an incoming object flow, it must have an outgoing object flow, otherwise, it must have an outgoing control flow.]]></description>
             <message><![CDATA[If a join node has an incoming object flow, it must have an outgoing object flow, otherwise, it must have an outgoing control flow.]]></message>
@@ -2195,7 +2178,7 @@ and self.decisionInput.ownedParameter->select(
             name="validateIncomingOrOutgoing"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[(self.incoming->notEmpty() implies self.outgoing->isEmpty()) and

+            <![CDATA[(self.incoming->notEmpty() implies self.outgoing->isEmpty()) and
 (self.outgoing->notEmpty() implies self.incoming->isEmpty())]]>
             <description><![CDATA[An activity parameter node must not have both incoming and outgoing edges.]]></description>
             <message><![CDATA[An activity parameter node must not have both incoming and outgoing edges.]]></message>
@@ -2306,7 +2289,7 @@ and self.decisionInput.ownedParameter->select(
             name="validateValideTypeOwningFeature"
             mode="Batch"
             severity="ERROR" statusCode="200">
-            <![CDATA[self.structuralFeature.featuringClassifier.oclAsType(Type)->includes(self.object.type) or

+            <![CDATA[self.structuralFeature.featuringClassifier.oclAsType(Type)->includes(self.object.type) or
 self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
             <description><![CDATA[Check that the structural feature must either be owned by the type of the object input pin, or it must be an owned end of a binary]]></description>
             <message><![CDATA[The structural feature must either be owned by the type of the object input pin, or it must be an owned end of a binary]]></message>
@@ -2525,1543 +2508,1543 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
                </binding>
 
    </extension>
-   

-<extension point="org.eclipse.emf.validation.constraintProviders">

-      <?gmfgen generated="false"?>

-      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/pinAndParameterSynchronization" mandatory="false" name="validatePinAndParameterSynchronization">

-         <![CDATA[Validate that Pin and corresponding Parameter are correctly synchronized]]>

-      </category>

-      <constraintProvider cache="true">

-         <package namespaceUri="http://www.eclipse.org/uml2/5.0.0/UML"/>

-         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/pinAndParameterSynchronization">

-                  <constraint id="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"

-            lang="Java"

-            name="PinAndParameterSynchronizer"

-            class="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"

-            mode="Batch"
-            severity="ERROR" statusCode="200">
-            <description><![CDATA[Action's Pins and invoked object's Parameters are synchronized]]></description>

-            <message><![CDATA[Action's Pins must correspond to the called object's Parameters]]></message>

-            <target class="uml.Pin"/>

-            <target class="uml.Parameter"/>

-            <target class="uml.Property"/>

-            <target class="uml.CallOperationAction"/>

-            <target class="uml.Operation"/>

-            <target class="uml.CallBehaviorAction"/>

-            <target class="uml.Behavior"/>

-            <target class="uml.ValueSpecification"/>

-            <target class="uml.SendSignalAction"/>

-            <target class="uml.Signal"/>

-            <target class="uml.SendObjectAction"/>

-            <target class="uml.BroadcastSignalAction"/>

-         </constraint>
-                  </constraints>

-      </constraintProvider>

-   </extension>

-

-	<extension point="org.eclipse.emf.validation.constraintBindings">

-      <?gmfgen generated="false"?>

-      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">

-         <selector class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationProvider$DefaultCtx"/>

-      </clientContext>

-      <binding context="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"/>

-      </binding>

-

-   </extension>

-   

-   <extension point="org.eclipse.emf.validation.constraintProviders">

-      <?gmfgen generated="false"?>

-      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/activityParameterAndParameterSynchronization" mandatory="false" name="synchronizeActivityParameterAndParameter">

-         <![CDATA[Validate that Activity Parameter Node and corresponding Parameter type are correctly synchronized]]>

-      </category>

-      <constraintProvider cache="true">

-         <package namespaceUri="http://www.eclipse.org/uml2/3.0.0/UML"/>

-         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/activityParameterAndParameterSynchronization">

-                  <constraint id="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"

-            lang="Java"

-            name="ActivityParameterAndParameterSynchronizer"

-            class="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"

-            mode="Batch"
-            severity="ERROR" statusCode="200">
-            <description><![CDATA[Validate that Activity Parameter Node and corresponding Parameter type are correctly synchronized]]></description>

-            <message>Activity parameter node must be synchronized with its parameter.</message>

-            <target class="uml.Activity"/>

-            <target class="uml.Parameter"/>

-            <target class="uml.ActivityParameterNode"/>

-         </constraint>
-                  </constraints>

-      </constraintProvider>

-   </extension>

-

-	<extension point="org.eclipse.emf.validation.constraintBindings">

-      <?gmfgen generated="false"?>

-      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">

-         <selector class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationProvider$DefaultCtx"/>

-      </clientContext>

-      <binding context="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"/>

-               </binding>

-

-   </extension>

-

-   <extension

-         point="org.eclipse.ui.views.properties.tabbed.propertySections">

-      <propertySections

-            contributorId="TreeOutlinePage">

-         <propertySection

-               class="org.eclipse.papyrus.uml.diagram.activity.tabbedproperties.appearance.SwitchSegmentDirectionSection"

-               filter="org.eclipse.papyrus.uml.diagram.activity.tabbedproperties.appearance.SwitchSegmentDirectionSectionFilter"

-               id="org.eclipse.papyrus.tabbedproperties.appearance.switchSegmentDirectionSection"

-               tab="org.eclipse.papyrus.tabbedproperties.appearance.appearancetab">

-         </propertySection>

-      </propertySections>

-   </extension>

-   <!--

-   <extension

-         point="org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment"

-         name="ActivityGroup"

-         id="org.eclipse.papyrus.uml.diagram.activity.activitygroup">

-         <modelContainer editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart"

-          descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.StructuredActivityNodeContainment"/>

-         <modelContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ConditionalNodeContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeStructuredActivityNodeContentCompartmentEditPart">

-         </modelContainer>

-         <modelContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ExpansionRegionContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStructuredActivityNodeContentCompartmentEditPart">

-         </modelContainer>

-         <modelContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.LoopNodeContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart">

-         </modelContainer>

-         <modelContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.SequenceNodeContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructuredActivityNodeContentCompartmentEditPart">

-         </modelContainer>

-         <referenceContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.InterruptibleActivityRegionContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart"/>

-         <referenceContainer

-               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ActivityPartitionContainment"

-               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityPartitionActivityPartitionContentCompartmentEditPart"/>

-   </extension>

-   -->

-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-      <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationDecoratorProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-         <context decoratorTargets="PRIMARY_VIEW"/>

-      </decoratorProvider>

-   </extension>

-

+   
+<extension point="org.eclipse.emf.validation.constraintProviders">
+      <?gmfgen generated="false"?>
+      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/pinAndParameterSynchronization" mandatory="false" name="validatePinAndParameterSynchronization">
+         <![CDATA[Validate that Pin and corresponding Parameter are correctly synchronized]]>
+      </category>
+      <constraintProvider cache="true">
+         <package namespaceUri="http://www.eclipse.org/uml2/5.0.0/UML"/>
+         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/pinAndParameterSynchronization">
+                  <constraint id="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"
+            lang="Java"
+            name="PinAndParameterSynchronizer"
+            class="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"
+            mode="Batch"
+            severity="ERROR" statusCode="200">
+            <description><![CDATA[Action's Pins and invoked object's Parameters are synchronized]]></description>
+            <message><![CDATA[Action's Pins must correspond to the called object's Parameters]]></message>
+            <target class="uml.Pin"/>
+            <target class="uml.Parameter"/>
+            <target class="uml.Property"/>
+            <target class="uml.CallOperationAction"/>
+            <target class="uml.Operation"/>
+            <target class="uml.CallBehaviorAction"/>
+            <target class="uml.Behavior"/>
+            <target class="uml.ValueSpecification"/>
+            <target class="uml.SendSignalAction"/>
+            <target class="uml.Signal"/>
+            <target class="uml.SendObjectAction"/>
+            <target class="uml.BroadcastSignalAction"/>
+         </constraint>
+                  </constraints>
+      </constraintProvider>
+   </extension>
+
+	<extension point="org.eclipse.emf.validation.constraintBindings">
+      <?gmfgen generated="false"?>
+      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">
+         <selector class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationProvider$DefaultCtx"/>
+      </clientContext>
+      <binding context="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.activity.helper.PinAndParameterSynchronizer"/>
+      </binding>
+
+   </extension>
+   
+   <extension point="org.eclipse.emf.validation.constraintProviders">
+      <?gmfgen generated="false"?>
+      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/activityParameterAndParameterSynchronization" mandatory="false" name="synchronizeActivityParameterAndParameter">
+         <![CDATA[Validate that Activity Parameter Node and corresponding Parameter type are correctly synchronized]]>
+      </category>
+      <constraintProvider cache="true">
+         <package namespaceUri="http://www.eclipse.org/uml2/3.0.0/UML"/>
+         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/activityParameterAndParameterSynchronization">
+                  <constraint id="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"
+            lang="Java"
+            name="ActivityParameterAndParameterSynchronizer"
+            class="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"
+            mode="Batch"
+            severity="ERROR" statusCode="200">
+            <description><![CDATA[Validate that Activity Parameter Node and corresponding Parameter type are correctly synchronized]]></description>
+            <message>Activity parameter node must be synchronized with its parameter.</message>
+            <target class="uml.Activity"/>
+            <target class="uml.Parameter"/>
+            <target class="uml.ActivityParameterNode"/>
+         </constraint>
+                  </constraints>
+      </constraintProvider>
+   </extension>
+
+	<extension point="org.eclipse.emf.validation.constraintBindings">
+      <?gmfgen generated="false"?>
+      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">
+         <selector class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationProvider$DefaultCtx"/>
+      </clientContext>
+      <binding context="org.eclipse.papyrus.uml.diagram.activityDefaultCtx">
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.activity.helper.ActivityParameterAndParameterSynchronizer"/>
+               </binding>
+
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.views.properties.tabbed.propertySections">
+      <propertySections
+            contributorId="TreeOutlinePage">
+         <propertySection
+               class="org.eclipse.papyrus.uml.diagram.activity.tabbedproperties.appearance.SwitchSegmentDirectionSection"
+               filter="org.eclipse.papyrus.uml.diagram.activity.tabbedproperties.appearance.SwitchSegmentDirectionSectionFilter"
+               id="org.eclipse.papyrus.tabbedproperties.appearance.switchSegmentDirectionSection"
+               tab="org.eclipse.papyrus.tabbedproperties.appearance.appearancetab">
+         </propertySection>
+      </propertySections>
+   </extension>
+   <!--
+   <extension
+         point="org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment"
+         name="ActivityGroup"
+         id="org.eclipse.papyrus.uml.diagram.activity.activitygroup">
+         <modelContainer editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart"
+          descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.StructuredActivityNodeContainment"/>
+         <modelContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ConditionalNodeContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ConditionalNodeStructuredActivityNodeContentCompartmentEditPart">
+         </modelContainer>
+         <modelContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ExpansionRegionContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ExpansionRegionStructuredActivityNodeContentCompartmentEditPart">
+         </modelContainer>
+         <modelContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.LoopNodeContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.LoopNodeStructuredActivityNodeContentCompartmentEditPart">
+         </modelContainer>
+         <modelContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.SequenceNodeContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.SequenceNodeStructuredActivityNodeContentCompartmentEditPart">
+         </modelContainer>
+         <referenceContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.InterruptibleActivityRegionContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart"/>
+         <referenceContainer
+               descriptor="org.eclipse.papyrus.uml.diagram.activity.groupcontainment.ActivityPartitionContainment"
+               editPartType="org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityPartitionActivityPartitionContentCompartmentEditPart"/>
+   </extension>
+   -->
+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+      <?gmfgen generated="true"?>
+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLValidationDecoratorProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+         <context decoratorTargets="PRIMARY_VIEW"/>
+      </decoratorProvider>
+   </extension>
+
 <extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">
       <?gmfgen generated="true"?>
       <clientContext id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx"/>
    </extension>
 
 
-<extension

-		id="Papyrus activity editor Plugin.palettedefinition"

-		name="Papyrus activity editor Plugin Predefined Entries"

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

-		

-		<?gmfgen generated="true"?>	

-		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-			<Priority name="Lowest"/>

-      		<contribution

-            	factoryClass="org.eclipse.papyrus.uml.diagram.activity.part.UMLPaletteFactory">

-     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-					<entry

-       defineOnly="true"

-       description="Create an Activity Partition"

-       id="createActivityPartition1CreationTool"

-       kind="tool"

-       label="Activity Partition"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Interruptible Activity Region"

-       id="createInterruptibleActivityRegion2CreationTool"

-       kind="tool"

-       label="Interruptible Activity Region"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Initial node"

-       id="createInitialnode1CreationTool"

-       kind="tool"

-       label="Initial node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Activity final node"

-       id="createActivityfinal2CreationTool"

-       kind="tool"

-       label="Activity final"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Flow final node"

-       id="createFlowfinal3CreationTool"

-       kind="tool"

-       label="Flow final"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Decision node"

-       id="createDecisionnode4CreationTool"

-       kind="tool"

-       label="Decision node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Merge node"

-       id="createMergenode5CreationTool"

-       kind="tool"

-       label="Merge node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Merge node"

-       id="createJoinnode6CreationTool"

-       kind="tool"

-       label="Join node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Fork node"

-       id="createForknode7CreationTool"

-       kind="tool"

-       label="Fork node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Activity"

-       id="createActivity1CreationTool"

-       kind="tool"

-       label="Activity"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Activity Parameter Node"

-       id="createActivityParameterNode2CreationTool"

-       kind="tool"

-       label="Activity Parameter Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Central Buffer Node"

-       id="createCentralBufferNode3CreationTool"

-       kind="tool"

-       label="Central Buffer Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Data Store Node"

-       id="createDataStoreNode4CreationTool"

-       kind="tool"

-       label="Data Store Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Comment"

-       id="createComment5CreationTool"

-       kind="tool"

-       label="Comment"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Cosntraint"

-       id="createConstraint6CreationTool"

-       kind="tool"

-       label="Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Control Flow"

-       id="createControlFlow1CreationTool"

-       kind="tool"

-       label="Control Flow"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Exception Handler"

-       id="createExceptionHandler2CreationTool"

-       kind="tool"

-       label="Exception Handler"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Object Flow"

-       id="createObjectFlow3CreationTool"

-       kind="tool"

-       label="Object Flow"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create of a link for comment"

-       id="createLink4CreationTool"

-       kind="tool"

-       label="Link"

-       large_icon="icons/obj16/Link.gif"

-       path=""

-       small_icon="icons/obj16/Link.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Constraint as Local Precondition for an Action"

-       id="createLocalPreconditionConstraint1CreationTool"

-       kind="tool"

-       label="Local Precondition Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Interval Constraint as Local Precondition for an Action"

-       id="createLocalPreconditionIntervalConstraint3CreationTool"

-       kind="tool"

-       label="Local Precondition Interval Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Duration Constraint as Local Precondition for an Action"

-       id="createLocalPreconditionDurationConstraint4CreationTool"

-       kind="tool"

-       label="Local Precondition Duration Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Time Constraint as Local Precondition for an Action"

-       id="createLocalPreconditionTimeConstraint5CreationTool"

-       kind="tool"

-       label="Local Precondition Time Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Constraint as Local Postcondition for an Action"

-       id="createLocalPostconditionConstraint6CreationTool"

-       kind="tool"

-       label="Local Postcondition Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Interval Constraint as Local Postcondition for an Action"

-       id="createLocalPostconditionIntervalConstraint8CreationTool"

-       kind="tool"

-       label="Local Postcondition Interval Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Duration Constraint as Local Postcondition for an Action"

-       id="createLocalPostconditionDurationConstraint9CreationTool"

-       kind="tool"

-       label="Local Postcondition Duration Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Time Constraint as Local Postcondition for an Action"

-       id="createLocalPostconditionTimeConstraint10CreationTool"

-       kind="tool"

-       label="Local Postcondition Time Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Output Pin"

-       id="createOutputPin1CreationTool"

-       kind="tool"

-       label="Output Pin"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Input Pin"

-       id="createInputPin2CreationTool"

-       kind="tool"

-       label="Input Pin"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Action Input Pin"

-       id="createActionInputPin3CreationTool"

-       kind="tool"

-       label="Action Input Pin"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Value Pin"

-       id="createValuePin4CreationTool"

-       kind="tool"

-       label="Value Pin"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Expansion Region"

-       id="createExpansionRegion1CreationTool"

-       kind="tool"

-       label="Expansion Region"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Expansion Node as Input of an Expansion Region"

-       id="createInputExpansionNode2CreationTool"

-       kind="tool"

-       label="Input Expansion Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Expansion Node as Output of an Expansion Region"

-       id="createOutputExpansionNode3CreationTool"

-       kind="tool"

-       label="Output Expansion Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Broadcast Signal Action"

-       id="createBroadcastSignalAction1CreationTool"

-       kind="tool"

-       label="Broadcast Signal Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Call Behavior Action node"

-       id="createCallBehaviorAction2CreationTool"

-       kind="tool"

-       label="Call Behavior Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Call Operation Action node"

-       id="createCallOperationAction3CreationTool"

-       kind="tool"

-       label="Call Operation Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Send Object Action node"

-       id="createSendObjectAction4CreationTool"

-       kind="tool"

-       label="Send Object Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Send Signal Action node"

-       id="createSendSignalAction5CreationTool"

-       kind="tool"

-       label="Send Signal Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Create Object Action"

-       id="createCreateObjectAction1CreationTool"

-       kind="tool"

-       label="Create Object Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Destroy Object Action"

-       id="createDestroyObjectAction2CreationTool"

-       kind="tool"

-       label="Destroy Object Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a ReadSelfAction"

-       id="createReadSelfAction3CreationTool"

-       kind="tool"

-       label="ReadSelfAction"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Structured Activity Node"

-       id="createStructuredActivityNode1CreationTool"

-       kind="tool"

-       label="Structured Activity Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Loop Node"

-       id="createLoopNode2CreationTool"

-       kind="tool"

-       label="Loop Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Sequence Node"

-       id="createSequenceNode3CreationTool"

-       kind="tool"

-       label="Sequence Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Conditional Node"

-       id="createConditionalNode4CreationTool"

-       kind="tool"

-       label="Conditional Node"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Read Structural Feature Action"

-       id="createReadStructuralFeatureAction1CreationTool"

-       kind="tool"

-       label="Read Structural Feature Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Add Structural Feature Value Action"

-       id="createAddStructuralFeatureValueAction2CreationTool"

-       kind="tool"

-       label="Add Structural Feature Value Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Add Structural Feature Value Action"

-       id="createAddStructuralFeatureValueAction3CreationTool"

-       kind="tool"

-       label="Add Structural Feature Value Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Read Structural Feature Action"

-       id="createReadStructuralFeatureAction4CreationTool"

-       kind="tool"

-       label="Read Structural Feature Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Add Variable Value Action"

-       id="createAddVariableValueAction1CreationTool"

-       kind="tool"

-       label="Add Variable Value Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Read Variable Action"

-       id="createReadVariableAction2CreationTool"

-       kind="tool"

-       label="Read Variable Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Opaque Action node"

-       id="createOpaqueAction1CreationTool"

-       kind="tool"

-       label="Opaque Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Value Specification Action node"

-       id="createValueSpecificationAction2CreationTool"

-       kind="tool"

-       label="Value Specification Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Accept Event Action node"

-       id="createAcceptEventAction1CreationTool"

-       kind="tool"

-       label="Accept Event Action"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif">

- 	</entry>

-

-			</contribution>

-		</paletteProvider>	

-			

-	</extension>

-

-

-<extension

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

-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.activity.activitygroup.GroupEditPolicyProvider">

-      <Priority

-            name="Low">

-      </Priority>

-   </editpolicyProvider>

-</extension>

-<extension

-       point="org.eclipse.emf.transaction.listeners">

-    <listener

-          class="org.eclipse.papyrus.uml.diagram.activity.listeners.InterruptibleEdgeListener">

-       <editingDomain

-             id="org.eclipse.papyrus.SharedEditingDomainID">

-       </editingDomain></listener>

-    <listener

-          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ExceptionHandlerListener">

-       <editingDomain

-             id="org.eclipse.papyrus.SharedEditingDomainID">

-       </editingDomain>

-    </listener>

-    <listener

-          class="org.eclipse.papyrus.uml.diagram.activity.listeners.InInterruptibleActivityRegionListener">

-       <editingDomain

-             id="org.eclipse.papyrus.SharedEditingDomainID">

-       </editingDomain>

-    </listener>

-    <listener

-          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ObjectNodeListener">

-       <editingDomain

-             id="org.eclipse.papyrus.SharedEditingDomainID">

-       </editingDomain>

-    </listener>

-    <listener

-          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ObjectFlowListener">

-       <editingDomain

-             id="org.eclipse.papyrus.SharedEditingDomainID">

-       </editingDomain>

-    </listener>

- </extension>

- 

- <extension

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

-   <editpartProvider

-         class="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider">

-      <Priority

-            name="Highest">

-      </Priority>

-      <object

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

-            id="generated-diagram">

-         <method

-               name="getType()"

-               value="PapyrusUMLActivityDiagram">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-nodes">

-         <method

-               name="getType()">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Edge"

-            id="generated-links">

-         <method

-               name="getType()">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-labels">

-         <method

-               name="getType()">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-compartments">

-         <method

-               name="getType()">

-         </method>

-      </object>

-      <context

-            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">

-      </context>

-   </editpartProvider>

-</extension>

-

-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLViewProvider">

-         <Priority name="Medium"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLActivityDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge"/>

-      </viewProvider>

-   </extension>

-   

-   

-   <extension

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

-      <command

-            description="Synchronize pins and parameters"

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

-            id="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"

-            name="Synchronize pins and parameters">

-      </command>

-      </extension>

-

-<extension

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

-      <command

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

-            description="Global Synchronize pins and parameters"

-            id="org.eclipse.papyrus.uml.diagram.activity.GlobalSynchronizePinsParametersCommand"

-            name="Global Synchronize pins and parameters">

-      </command>

-</extension>

-

-<extension

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

-      <handler

-            class="org.eclipse.papyrus.uml.diagram.activity.handlers.SynchronizePinsParametersHandler"

-            commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand">

-      </handler>

-      </extension>

-

-<extension

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

-      <handler

-            class="org.eclipse.papyrus.uml.diagram.activity.handlers.GlobalSynchronizePinsParametersHandler"

-            commandId="org.eclipse.papyrus.uml.diagram.activity.GlobalSynchronizePinsParametersCommand">

-      </handler>

-</extension>

-

-<!-- Defnition for seleciton is call action and editor is papyrus -->

-	<extension

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

-	

-		<definition id="org.eclipse.papyrus.diagram.common.IsCallAction">

-			<and>

-			

-	

-			<with variable="selection">

-				<test property="org.eclipse.papyrus.UMLCallActionTester.isCallAction" value="true"

-					forcePluginActivation="true"/>

-			</with>

-			

-			</and>

-		</definition>

-	</extension>

-

-<!--Test for selection of a call Action -->

-	 <extension

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

-		<propertyTester

-	       class="org.eclipse.papyrus.uml.diagram.activity.testers.UMLCallActionTester"

-	       id="org.eclipse.papyrus.UMLCallActionTester"

-	       namespace="org.eclipse.papyrus.UMLCallActionTester"

-	       properties="isCallAction"

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

-	</propertyTester>

-	</extension>

-

-<extension

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

-

-	<menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?endof=fileMenu"

-		allPopups="false">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"

-            icon="icons/obj16/RefreshPin.png"

-            label="Synchronize pins and parameters"

-            mnemonic="Synchronize pins and parameters of the current selection"

-            style="push">

-         <visibleWhen>

-            <and>

-               

-            <reference

-                  definitionId="org.eclipse.papyrus.diagram.common.IsCallAction">

-            </reference>

-               

-            </and>

-         </visibleWhen>

-      </command>

-   </menuContribution>

- <menuContribution

-       allPopups="false"

-       locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

-    <command

-          commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"

-          icon="icons/obj16/RefreshPin.png"

-          label="Synchronize pins and parameters"

-          mnemonic="Synchronize pins and parameters of the current selection"

-          style="push">

-       <visibleWhen>

-          <and>

-             <reference

-                   definitionId="org.eclipse.papyrus.diagram.common.IsCallAction">

-             </reference>

-          </and>

-       </visibleWhen>

-    </command>

- </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.views.properties.tabbed.propertyTabs">

-   <propertyTabs

-         contributorId="TreeOutlinePage">

-      <propertyTab

-            category="org.eclipse.papyrus"

-            id="org.eclipse.papyrus.tabbedproperties.appearance.appearancetab"

-            label="Appearance">

-      </propertyTab>

-   </propertyTabs>

-</extension>

-

-	

-	

+<extension
+		id="Papyrus activity editor Plugin.palettedefinition"
+		name="Papyrus activity editor Plugin Predefined Entries"
+		point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+		
+		<?gmfgen generated="true"?>	
+		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+			<Priority name="Lowest"/>
+      		<contribution
+            	factoryClass="org.eclipse.papyrus.uml.diagram.activity.part.UMLPaletteFactory">
+     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+					<entry
+       defineOnly="true"
+       description="Create an Activity Partition"
+       id="createActivityPartition1CreationTool"
+       kind="tool"
+       label="Activity Partition"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityPartition.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Interruptible Activity Region"
+       id="createInterruptibleActivityRegion2CreationTool"
+       kind="tool"
+       label="Interruptible Activity Region"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterruptibleActivityRegion.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Initial node"
+       id="createInitialnode1CreationTool"
+       kind="tool"
+       label="Initial node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InitialNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Activity final node"
+       id="createActivityfinal2CreationTool"
+       kind="tool"
+       label="Activity final"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityFinalNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Flow final node"
+       id="createFlowfinal3CreationTool"
+       kind="tool"
+       label="Flow final"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FlowFinalNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Decision node"
+       id="createDecisionnode4CreationTool"
+       kind="tool"
+       label="Decision node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DecisionNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Merge node"
+       id="createMergenode5CreationTool"
+       kind="tool"
+       label="Merge node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/MergeNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Merge node"
+       id="createJoinnode6CreationTool"
+       kind="tool"
+       label="Join node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/JoinNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Fork node"
+       id="createForknode7CreationTool"
+       kind="tool"
+       label="Fork node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ForkNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Activity"
+       id="createActivity1CreationTool"
+       kind="tool"
+       label="Activity"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Activity Parameter Node"
+       id="createActivityParameterNode2CreationTool"
+       kind="tool"
+       label="Activity Parameter Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActivityParameterNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Central Buffer Node"
+       id="createCentralBufferNode3CreationTool"
+       kind="tool"
+       label="Central Buffer Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Data Store Node"
+       id="createDataStoreNode4CreationTool"
+       kind="tool"
+       label="Data Store Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataStoreNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Comment"
+       id="createComment5CreationTool"
+       kind="tool"
+       label="Comment"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Cosntraint"
+       id="createConstraint6CreationTool"
+       kind="tool"
+       label="Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Control Flow"
+       id="createControlFlow1CreationTool"
+       kind="tool"
+       label="Control Flow"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ControlFlow.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Exception Handler"
+       id="createExceptionHandler2CreationTool"
+       kind="tool"
+       label="Exception Handler"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExceptionHandler.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Object Flow"
+       id="createObjectFlow3CreationTool"
+       kind="tool"
+       label="Object Flow"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ObjectFlow.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create of a link for comment"
+       id="createLink4CreationTool"
+       kind="tool"
+       label="Link"
+       large_icon="icons/obj16/Link.gif"
+       path=""
+       small_icon="icons/obj16/Link.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Constraint as Local Precondition for an Action"
+       id="createLocalPreconditionConstraint1CreationTool"
+       kind="tool"
+       label="Local Precondition Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Interval Constraint as Local Precondition for an Action"
+       id="createLocalPreconditionIntervalConstraint3CreationTool"
+       kind="tool"
+       label="Local Precondition Interval Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Duration Constraint as Local Precondition for an Action"
+       id="createLocalPreconditionDurationConstraint4CreationTool"
+       kind="tool"
+       label="Local Precondition Duration Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Time Constraint as Local Precondition for an Action"
+       id="createLocalPreconditionTimeConstraint5CreationTool"
+       kind="tool"
+       label="Local Precondition Time Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Constraint as Local Postcondition for an Action"
+       id="createLocalPostconditionConstraint6CreationTool"
+       kind="tool"
+       label="Local Postcondition Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Interval Constraint as Local Postcondition for an Action"
+       id="createLocalPostconditionIntervalConstraint8CreationTool"
+       kind="tool"
+       label="Local Postcondition Interval Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/IntervalConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Duration Constraint as Local Postcondition for an Action"
+       id="createLocalPostconditionDurationConstraint9CreationTool"
+       kind="tool"
+       label="Local Postcondition Duration Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Time Constraint as Local Postcondition for an Action"
+       id="createLocalPostconditionTimeConstraint10CreationTool"
+       kind="tool"
+       label="Local Postcondition Time Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Output Pin"
+       id="createOutputPin1CreationTool"
+       kind="tool"
+       label="Output Pin"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OutputPin.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Input Pin"
+       id="createInputPin2CreationTool"
+       kind="tool"
+       label="Input Pin"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InputPin.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Action Input Pin"
+       id="createActionInputPin3CreationTool"
+       kind="tool"
+       label="Action Input Pin"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionInputPin.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Value Pin"
+       id="createValuePin4CreationTool"
+       kind="tool"
+       label="Value Pin"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValuePin.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Expansion Region"
+       id="createExpansionRegion1CreationTool"
+       kind="tool"
+       label="Expansion Region"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionRegion.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Expansion Node as Input of an Expansion Region"
+       id="createInputExpansionNode2CreationTool"
+       kind="tool"
+       label="Input Expansion Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Expansion Node as Output of an Expansion Region"
+       id="createOutputExpansionNode3CreationTool"
+       kind="tool"
+       label="Output Expansion Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExpansionNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Broadcast Signal Action"
+       id="createBroadcastSignalAction1CreationTool"
+       kind="tool"
+       label="Broadcast Signal Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BroadcastSignalAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Call Behavior Action node"
+       id="createCallBehaviorAction2CreationTool"
+       kind="tool"
+       label="Call Behavior Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallBehaviorAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Call Operation Action node"
+       id="createCallOperationAction3CreationTool"
+       kind="tool"
+       label="Call Operation Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Send Object Action node"
+       id="createSendObjectAction4CreationTool"
+       kind="tool"
+       label="Send Object Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendObjectAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Send Signal Action node"
+       id="createSendSignalAction5CreationTool"
+       kind="tool"
+       label="Send Signal Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SendSignalAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Create Object Action"
+       id="createCreateObjectAction1CreationTool"
+       kind="tool"
+       label="Create Object Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CreateObjectAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Destroy Object Action"
+       id="createDestroyObjectAction2CreationTool"
+       kind="tool"
+       label="Destroy Object Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a ReadSelfAction"
+       id="createReadSelfAction3CreationTool"
+       kind="tool"
+       label="ReadSelfAction"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadSelfAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Structured Activity Node"
+       id="createStructuredActivityNode1CreationTool"
+       kind="tool"
+       label="Structured Activity Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StructuredActivityNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Loop Node"
+       id="createLoopNode2CreationTool"
+       kind="tool"
+       label="Loop Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/LoopNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Sequence Node"
+       id="createSequenceNode3CreationTool"
+       kind="tool"
+       label="Sequence Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/SequenceNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Conditional Node"
+       id="createConditionalNode4CreationTool"
+       kind="tool"
+       label="Conditional Node"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConditionalNode.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Read Structural Feature Action"
+       id="createReadStructuralFeatureAction1CreationTool"
+       kind="tool"
+       label="Read Structural Feature Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Add Structural Feature Value Action"
+       id="createAddStructuralFeatureValueAction2CreationTool"
+       kind="tool"
+       label="Add Structural Feature Value Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Add Structural Feature Value Action"
+       id="createAddStructuralFeatureValueAction3CreationTool"
+       kind="tool"
+       label="Add Structural Feature Value Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddStructuralFeatureValueAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Read Structural Feature Action"
+       id="createReadStructuralFeatureAction4CreationTool"
+       kind="tool"
+       label="Read Structural Feature Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadStructuralFeatureAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Add Variable Value Action"
+       id="createAddVariableValueAction1CreationTool"
+       kind="tool"
+       label="Add Variable Value Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AddVariableValueAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Read Variable Action"
+       id="createReadVariableAction2CreationTool"
+       kind="tool"
+       label="Read Variable Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ReadVariableAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Opaque Action node"
+       id="createOpaqueAction1CreationTool"
+       kind="tool"
+       label="Opaque Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Value Specification Action node"
+       id="createValueSpecificationAction2CreationTool"
+       kind="tool"
+       label="Value Specification Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ValueSpecificationAction.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Accept Event Action node"
+       id="createAcceptEventAction1CreationTool"
+       kind="tool"
+       label="Accept Event Action"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AcceptEventAction.gif">
+ 	</entry>
+
+			</contribution>
+		</paletteProvider>	
+			
+	</extension>
+
+
+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+   <editpolicyProvider
+         class="org.eclipse.papyrus.uml.diagram.activity.activitygroup.GroupEditPolicyProvider">
+      <Priority
+            name="Low">
+      </Priority>
+   </editpolicyProvider>
+</extension>
+<extension
+       point="org.eclipse.emf.transaction.listeners">
+    <listener
+          class="org.eclipse.papyrus.uml.diagram.activity.listeners.InterruptibleEdgeListener">
+       <editingDomain
+             id="org.eclipse.papyrus.SharedEditingDomainID">
+       </editingDomain></listener>
+    <listener
+          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ExceptionHandlerListener">
+       <editingDomain
+             id="org.eclipse.papyrus.SharedEditingDomainID">
+       </editingDomain>
+    </listener>
+    <listener
+          class="org.eclipse.papyrus.uml.diagram.activity.listeners.InInterruptibleActivityRegionListener">
+       <editingDomain
+             id="org.eclipse.papyrus.SharedEditingDomainID">
+       </editingDomain>
+    </listener>
+    <listener
+          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ObjectNodeListener">
+       <editingDomain
+             id="org.eclipse.papyrus.SharedEditingDomainID">
+       </editingDomain>
+    </listener>
+    <listener
+          class="org.eclipse.papyrus.uml.diagram.activity.listeners.ObjectFlowListener">
+       <editingDomain
+             id="org.eclipse.papyrus.SharedEditingDomainID">
+       </editingDomain>
+    </listener>
+ </extension>
+ 
+ <extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+   <editpartProvider
+         class="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLEditPartProvider">
+      <Priority
+            name="Highest">
+      </Priority>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Diagram"
+            id="generated-diagram">
+         <method
+               name="getType()"
+               value="PapyrusUMLActivityDiagram">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-nodes">
+         <method
+               name="getType()">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Edge"
+            id="generated-links">
+         <method
+               name="getType()">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-labels">
+         <method
+               name="getType()">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-compartments">
+         <method
+               name="getType()">
+         </method>
+      </object>
+      <context
+            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
+      </context>
+   </editpartProvider>
+</extension>
+
+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.CustomUMLViewProvider">
+         <Priority name="Medium"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLActivityDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge"/>
+      </viewProvider>
+   </extension>
+   
+   
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="Synchronize pins and parameters"
+            categoryId="org.eclipse.papyrus.editor.category"            
+            id="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"
+            name="Synchronize pins and parameters">
+      </command>
+      </extension>
+
+<extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Global Synchronize pins and parameters"
+            id="org.eclipse.papyrus.uml.diagram.activity.GlobalSynchronizePinsParametersCommand"
+            name="Global Synchronize pins and parameters">
+      </command>
+</extension>
+
+<extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.diagram.activity.handlers.SynchronizePinsParametersHandler"
+            commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand">
+      </handler>
+      </extension>
+
+<extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.uml.diagram.activity.handlers.GlobalSynchronizePinsParametersHandler"
+            commandId="org.eclipse.papyrus.uml.diagram.activity.GlobalSynchronizePinsParametersCommand">
+      </handler>
+</extension>
+
+<!-- Defnition for seleciton is call action and editor is papyrus -->
+	<extension
+		point="org.eclipse.core.expressions.definitions">	
+	
+		<definition id="org.eclipse.papyrus.diagram.common.IsCallAction">
+			<and>
+			
+	
+			<with variable="selection">
+				<test property="org.eclipse.papyrus.UMLCallActionTester.isCallAction" value="true"
+					forcePluginActivation="true"/>
+			</with>
+			
+			</and>
+		</definition>
+	</extension>
+
+<!--Test for selection of a call Action -->
+	 <extension
+		point="org.eclipse.core.expressions.propertyTesters">
+		<propertyTester
+	       class="org.eclipse.papyrus.uml.diagram.activity.testers.UMLCallActionTester"
+	       id="org.eclipse.papyrus.UMLCallActionTester"
+	       namespace="org.eclipse.papyrus.UMLCallActionTester"
+	       properties="isCallAction"
+	       type="org.eclipse.jface.viewers.ISelection">
+	</propertyTester>
+	</extension>
+
+<extension
+      point="org.eclipse.ui.menus">
+
+	<menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?endof=fileMenu"
+		allPopups="false">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"
+            icon="icons/obj16/RefreshPin.png"
+            label="Synchronize pins and parameters"
+            mnemonic="Synchronize pins and parameters of the current selection"
+            style="push">
+         <visibleWhen>
+            <and>
+               
+            <reference
+                  definitionId="org.eclipse.papyrus.diagram.common.IsCallAction">
+            </reference>
+               
+            </and>
+         </visibleWhen>
+      </command>
+   </menuContribution>
+ <menuContribution
+       allPopups="false"
+       locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">
+    <command
+          commandId="org.eclipse.papyrus.uml.diagram.activity.SynchronizePinsParametersCommand"
+          icon="icons/obj16/RefreshPin.png"
+          label="Synchronize pins and parameters"
+          mnemonic="Synchronize pins and parameters of the current selection"
+          style="push">
+       <visibleWhen>
+          <and>
+             <reference
+                   definitionId="org.eclipse.papyrus.diagram.common.IsCallAction">
+             </reference>
+          </and>
+       </visibleWhen>
+    </command>
+ </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
+   <propertyTabs
+         contributorId="TreeOutlinePage">
+      <propertyTab
+            category="org.eclipse.papyrus"
+            id="org.eclipse.papyrus.tabbedproperties.appearance.appearancetab"
+            label="Appearance">
+      </propertyTab>
+   </propertyTabs>
+</extension>
+
+	
+	
    <!-- Specific Edit Helper for Activity Node -->
 
-   <!-- optionally, specify keybindings -->

-   <!--specific palette-->

-<extension

-		id="Papyrus activity editor Plugin.standard"

-		name="Papyrus activity editor Plugin Standard Palette"

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

-		

-		<?gmfgen generated="true"?>	

-		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-			<Priority name="Low"/>

-      		<contribution

-            	factoryClass="org.eclipse.papyrus.uml.diagram.activity.part.UMLPaletteFactory">

-     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-    <entry

-          id="createNodes3Group"

-          kind="drawer"

-          label="Nodes"

-          large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-          path="/"

-          small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-             force="true">

-       </expand>

-    </entry>

-    <predefinedEntry

-          id="createAcceptEventAction1CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-    <predefinedEntry

-          id="createActivity1CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-    <predefinedEntry

-          id="createActivityParameterNode2CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-    <predefinedEntry

-          id="createCentralBufferNode3CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-    <predefinedEntry

-          id="createDataStoreNode4CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-    <predefinedEntry

-          id="createComment5CreationTool"

-          path="/createNodes3Group">

-    </predefinedEntry>

-					<entry

-       description="ActivityGroup"

-       id="createActivityGroupGroup"

-       kind="stack"

-       label="ActivityGroup"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createActivityPartition1CreationTool"

-          path="/createNodes3Group/createActivityGroupGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createInterruptibleActivityRegion2CreationTool"

-          path="/createNodes3Group/createActivityGroupGroup">

-    </predefinedEntry>

-

-	<entry

-       description="ControlNodes"

-       id="createControlNodesGroup"

-       kind="stack"

-       label="ControlNodes"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createInitialnode1CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createActivityfinal2CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createFlowfinal3CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createDecisionnode4CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMergenode5CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createJoinnode6CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createForknode7CreationTool"

-          path="/createNodes3Group/createControlNodesGroup">

-    </predefinedEntry>

-

- 	 

-

-	<entry

-       description=""

-       id="createEdges4Group"

-       kind="drawer"

-       label="Edges"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createControlFlow1CreationTool"

-          path="/createEdges4Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createExceptionHandler2CreationTool"

-          path="/createEdges4Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createObjectFlow3CreationTool"

-          path="/createEdges4Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLink4CreationTool"

-          path="/createEdges4Group">

-    </predefinedEntry>

-

-	<entry

-       description="Constraints"

-       id="createConstraintsGroup"

-       kind="stack"

-       label="Constraints"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="false">

-       </expand>

- 	</entry>

- 	<entry

-       description="Pins"

-       id="createPinsGroup"

-       kind="stack"

-       label="Pins"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createOutputPin1CreationTool"

-          path="/createNodes3Group/createPinsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createInputPin2CreationTool"

-          path="/createNodes3Group/createPinsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createActionInputPin3CreationTool"

-          path="/createNodes3Group/createPinsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createValuePin4CreationTool"

-          path="/createNodes3Group/createPinsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="ExpansionRegions"

-       id="createExpansionRegionsGroup"

-       kind="stack"

-       label="ExpansionRegions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createExpansionRegion1CreationTool"

-          path="/createNodes3Group/createExpansionRegionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createInputExpansionNode2CreationTool"

-          path="/createNodes3Group/createExpansionRegionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createOutputExpansionNode3CreationTool"

-          path="/createNodes3Group/createExpansionRegionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="InvocationActions"

-       id="InvocationActionsGroup"

-       kind="stack"

-       label="InvocationActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createBroadcastSignalAction1CreationTool"

-          path="/createNodes3Group/InvocationActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createCallBehaviorAction2CreationTool"

-          path="/createNodes3Group/InvocationActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createCallOperationAction3CreationTool"

-          path="/createNodes3Group/InvocationActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createSendObjectAction4CreationTool"

-          path="/createNodes3Group/InvocationActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createSendSignalAction5CreationTool"

-          path="/createNodes3Group/InvocationActionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="ObjectActions"

-       id="createObjectActionsGroup"

-       kind="stack"

-       label="ObjectActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createCreateObjectAction1CreationTool"

-          path="/createNodes3Group/createObjectActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createDestroyObjectAction2CreationTool"

-          path="/createNodes3Group/createObjectActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createReadSelfAction3CreationTool"

-          path="/createNodes3Group/createObjectActionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="StructuredActions"

-       id="createStructuredActionsGroup"

-       kind="stack"

-       label="StructuredActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createStructuredActivityNode1CreationTool"

-          path="/createNodes3Group/createStructuredActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLoopNode2CreationTool"

-          path="/createNodes3Group/createStructuredActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createSequenceNode3CreationTool"

-          path="/createNodes3Group/createStructuredActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createConditionalNode4CreationTool"

-          path="/createNodes3Group/createStructuredActionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="StructuralFeatureActions"

-       id="createStructuralFeatureActionsGroup"

-       kind="stack"

-       label="StructuralFeatureActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createReadStructuralFeatureAction1CreationTool"

-          path="/createNodes3Group/createStructuralFeatureActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createAddStructuralFeatureValueAction2CreationTool"

-          path="/createNodes3Group/createStructuralFeatureActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createAddStructuralFeatureValueAction3CreationTool"

-          path="/createNodes3Group/createStructuralFeatureActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createReadStructuralFeatureAction4CreationTool"

-          path="/createNodes3Group/createStructuralFeatureActionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="VariableActions"

-       id="createVariableActionsGroup"

-       kind="stack"

-       label="VariableActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createAddVariableValueAction1CreationTool"

-          path="/createNodes3Group/createVariableActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createReadVariableAction2CreationTool"

-          path="/createNodes3Group/createVariableActionsGroup">

-    </predefinedEntry>

-

-	<entry

-       description="MiscellaneousActions"

-       id="createOtherActionsGroup"

-       kind="stack"

-       label="MiscellaneousActions"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/createNodes3Group"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createOpaqueAction1CreationTool"

-          path="/createNodes3Group/createOtherActionsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createValueSpecificationAction2CreationTool"

-          path="/createNodes3Group/createOtherActionsGroup">

-    </predefinedEntry>

- <predefinedEntry

-       id="createConstraint6CreationTool"

-       path="/createNodes3Group/createConstraintsGroup">

- </predefinedEntry>

- 	 

- 	 	<predefinedEntry

-          id="createLocalPreconditionConstraint1CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPreconditionInteractionConstraint2CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPreconditionIntervalConstraint3CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPreconditionDurationConstraint4CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPreconditionTimeConstraint5CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPostconditionConstraint6CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPostconditionInteractionConstraint7CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPostconditionIntervalConstraint8CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPostconditionDurationConstraint9CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createLocalPostconditionTimeConstraint10CreationTool"

-          path="/createNodes3Group/createConstraintsGroup">

-    </predefinedEntry>

-

-	

-

-

-			</contribution>

-			<editor id="org.eclipse.papyrus.uml.diagram.activity"/>

-		</paletteProvider>	

-			

-	</extension>

-	

-	

-	<!-- Diagram specific advices -->

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

-

-	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-

-	<!-- specific advices (pop up on creation) -->		

-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" inheritance="none" typeId="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"/>

-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010"/>

-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052"/>

-				

-	</metamodel>

-</extension>

-

-<!-- UML ElementType bindings to Papyrus shared IClientContext -->

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

-

-	<!-- Bindings declaration to shared IClientContext -->

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

-		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice"></elementType>

-		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice"></elementType>

-		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice"></elementType>

-	</binding>

-		

-</extension>

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

-		<diagramMappings diagramID="PapyrusUMLActivityDiagram">

-			<mapping type="PapyrusUMLActivityDiagram" humanReadableType="ActivityDiagram"/>

-			

-	<mapping

-		humanReadableType="ActivityFigureParameter"

-		type="7001">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigurePrecondition"

-		type="7002">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigurePostCondtion"

-		type="7003">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigureContent"

-		type="7004">

-	</mapping>

-

-	<mapping

-		humanReadableType="StructuredActivityNodeContent"

-		type="7008">

-	</mapping>

-

-	<mapping

-		humanReadableType="StructuredActivityNodeContent"

-		type="7009">

-	</mapping>

-

-	<mapping

-		humanReadableType="StructuredActivityNodeContent"

-		type="7010">

-	</mapping>

-

-	<mapping

-		humanReadableType="StructuredActivityNodeContent"

-		type="7012">

-	</mapping>

-

-	<mapping

-		humanReadableType="StructuredActivityNodeContent"

-		type="7005">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityPartitionContent"

-		type="7006">

-	</mapping>

-

-	<mapping

-		humanReadableType="InterruptibleActivityRegionContent"

-		type="7007">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigureParameter"

-		type="7014">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigurePrecondition"

-		type="7015">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigurePostCondtion"

-		type="7016">

-	</mapping>

-

-	<mapping

-		humanReadableType="ActivityFigureContent"

-		type="7013">

-	</mapping>

-

-			

-	

-

-	

-

-	

-	<mapping

-		humanReadableType="Name"

-		type="6001">

-	</mapping>

-

-	<mapping

-		humanReadableType="Weight"

-		type="6002">

-	</mapping>

-

-	<mapping

-		humanReadableType="Selection"

-		type="6005">

-	</mapping>

-

-	<mapping

-		humanReadableType="Transformation"

-		type="6006">

-	</mapping>

-

-	<mapping

-		humanReadableType="DecisionInputFlow"

-		type="6007">

-	</mapping>

-

-	<mapping

-		humanReadableType="Guard"

-		type="6008">

-	</mapping>

-

-	<mapping

-		humanReadableType="Stereotype"

-		type="6010">

-	</mapping>

-

-

-	

-	<mapping

-		humanReadableType="Name"

-		type="6003">

-	</mapping>

-

-	<mapping

-		humanReadableType="Weight"

-		type="6004">

-	</mapping>

-

-	<mapping

-		humanReadableType="Guard"

-		type="6009">

-	</mapping>

-

-	<mapping

-		humanReadableType="Stereotype"

-		type="6011">

-	</mapping>

-

-

-	

-

-	

-

-	

-

-		</diagramMappings>

-	</extension>

-</plugin>

+   <!-- optionally, specify keybindings -->
+   <!--specific palette-->
+<extension
+		id="Papyrus activity editor Plugin.standard"
+		name="Papyrus activity editor Plugin Standard Palette"
+		point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+		
+		<?gmfgen generated="true"?>	
+		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+			<Priority name="Low"/>
+      		<contribution
+            	factoryClass="org.eclipse.papyrus.uml.diagram.activity.part.UMLPaletteFactory">
+     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+    <entry
+          id="createNodes3Group"
+          kind="drawer"
+          label="Nodes"
+          large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+          path="/"
+          small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+             force="true">
+       </expand>
+    </entry>
+    <predefinedEntry
+          id="createAcceptEventAction1CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+    <predefinedEntry
+          id="createActivity1CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+    <predefinedEntry
+          id="createActivityParameterNode2CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+    <predefinedEntry
+          id="createCentralBufferNode3CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+    <predefinedEntry
+          id="createDataStoreNode4CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+    <predefinedEntry
+          id="createComment5CreationTool"
+          path="/createNodes3Group">
+    </predefinedEntry>
+					<entry
+       description="ActivityGroup"
+       id="createActivityGroupGroup"
+       kind="stack"
+       label="ActivityGroup"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createActivityPartition1CreationTool"
+          path="/createNodes3Group/createActivityGroupGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createInterruptibleActivityRegion2CreationTool"
+          path="/createNodes3Group/createActivityGroupGroup">
+    </predefinedEntry>
+
+	<entry
+       description="ControlNodes"
+       id="createControlNodesGroup"
+       kind="stack"
+       label="ControlNodes"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createInitialnode1CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createActivityfinal2CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createFlowfinal3CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createDecisionnode4CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMergenode5CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createJoinnode6CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createForknode7CreationTool"
+          path="/createNodes3Group/createControlNodesGroup">
+    </predefinedEntry>
+
+ 	 
+
+	<entry
+       description=""
+       id="createEdges4Group"
+       kind="drawer"
+       label="Edges"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createControlFlow1CreationTool"
+          path="/createEdges4Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createExceptionHandler2CreationTool"
+          path="/createEdges4Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createObjectFlow3CreationTool"
+          path="/createEdges4Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLink4CreationTool"
+          path="/createEdges4Group">
+    </predefinedEntry>
+
+	<entry
+       description="Constraints"
+       id="createConstraintsGroup"
+       kind="stack"
+       label="Constraints"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="false">
+       </expand>
+ 	</entry>
+ 	<entry
+       description="Pins"
+       id="createPinsGroup"
+       kind="stack"
+       label="Pins"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createOutputPin1CreationTool"
+          path="/createNodes3Group/createPinsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createInputPin2CreationTool"
+          path="/createNodes3Group/createPinsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createActionInputPin3CreationTool"
+          path="/createNodes3Group/createPinsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createValuePin4CreationTool"
+          path="/createNodes3Group/createPinsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="ExpansionRegions"
+       id="createExpansionRegionsGroup"
+       kind="stack"
+       label="ExpansionRegions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createExpansionRegion1CreationTool"
+          path="/createNodes3Group/createExpansionRegionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createInputExpansionNode2CreationTool"
+          path="/createNodes3Group/createExpansionRegionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createOutputExpansionNode3CreationTool"
+          path="/createNodes3Group/createExpansionRegionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="InvocationActions"
+       id="InvocationActionsGroup"
+       kind="stack"
+       label="InvocationActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createBroadcastSignalAction1CreationTool"
+          path="/createNodes3Group/InvocationActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createCallBehaviorAction2CreationTool"
+          path="/createNodes3Group/InvocationActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createCallOperationAction3CreationTool"
+          path="/createNodes3Group/InvocationActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createSendObjectAction4CreationTool"
+          path="/createNodes3Group/InvocationActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createSendSignalAction5CreationTool"
+          path="/createNodes3Group/InvocationActionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="ObjectActions"
+       id="createObjectActionsGroup"
+       kind="stack"
+       label="ObjectActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createCreateObjectAction1CreationTool"
+          path="/createNodes3Group/createObjectActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createDestroyObjectAction2CreationTool"
+          path="/createNodes3Group/createObjectActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createReadSelfAction3CreationTool"
+          path="/createNodes3Group/createObjectActionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="StructuredActions"
+       id="createStructuredActionsGroup"
+       kind="stack"
+       label="StructuredActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createStructuredActivityNode1CreationTool"
+          path="/createNodes3Group/createStructuredActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLoopNode2CreationTool"
+          path="/createNodes3Group/createStructuredActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createSequenceNode3CreationTool"
+          path="/createNodes3Group/createStructuredActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createConditionalNode4CreationTool"
+          path="/createNodes3Group/createStructuredActionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="StructuralFeatureActions"
+       id="createStructuralFeatureActionsGroup"
+       kind="stack"
+       label="StructuralFeatureActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createReadStructuralFeatureAction1CreationTool"
+          path="/createNodes3Group/createStructuralFeatureActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createAddStructuralFeatureValueAction2CreationTool"
+          path="/createNodes3Group/createStructuralFeatureActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createAddStructuralFeatureValueAction3CreationTool"
+          path="/createNodes3Group/createStructuralFeatureActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createReadStructuralFeatureAction4CreationTool"
+          path="/createNodes3Group/createStructuralFeatureActionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="VariableActions"
+       id="createVariableActionsGroup"
+       kind="stack"
+       label="VariableActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createAddVariableValueAction1CreationTool"
+          path="/createNodes3Group/createVariableActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createReadVariableAction2CreationTool"
+          path="/createNodes3Group/createVariableActionsGroup">
+    </predefinedEntry>
+
+	<entry
+       description="MiscellaneousActions"
+       id="createOtherActionsGroup"
+       kind="stack"
+       label="MiscellaneousActions"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/createNodes3Group"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createOpaqueAction1CreationTool"
+          path="/createNodes3Group/createOtherActionsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createValueSpecificationAction2CreationTool"
+          path="/createNodes3Group/createOtherActionsGroup">
+    </predefinedEntry>
+ <predefinedEntry
+       id="createConstraint6CreationTool"
+       path="/createNodes3Group/createConstraintsGroup">
+ </predefinedEntry>
+ 	 
+ 	 	<predefinedEntry
+          id="createLocalPreconditionConstraint1CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPreconditionInteractionConstraint2CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPreconditionIntervalConstraint3CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPreconditionDurationConstraint4CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPreconditionTimeConstraint5CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPostconditionConstraint6CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPostconditionInteractionConstraint7CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPostconditionIntervalConstraint8CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPostconditionDurationConstraint9CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createLocalPostconditionTimeConstraint10CreationTool"
+          path="/createNodes3Group/createConstraintsGroup">
+    </predefinedEntry>
+
+	
+
+
+			</contribution>
+			<editor id="org.eclipse.papyrus.uml.diagram.activity"/>
+		</paletteProvider>	
+			
+	</extension>
+	
+	
+	<!-- Diagram specific advices -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+
+	<!-- specific advices (pop up on creation) -->		
+	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" inheritance="none" typeId="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"/>
+	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010"/>
+	<adviceBinding id="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" class="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" typeId="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052"/>
+				
+	</metamodel>
+</extension>
+
+<!-- UML ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration to shared IClientContext -->
+	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
+		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice"></elementType>
+		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice"></elementType>
+		<elementType ref="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice"></elementType>
+	</binding>
+		
+</extension>
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+		<diagramMappings diagramID="PapyrusUMLActivityDiagram">
+			<mapping type="PapyrusUMLActivityDiagram" humanReadableType="ActivityDiagram"/>
+			
+	<mapping
+		humanReadableType="ActivityFigureParameter"
+		type="7001">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigurePrecondition"
+		type="7002">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigurePostCondtion"
+		type="7003">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigureContent"
+		type="7004">
+	</mapping>
+
+	<mapping
+		humanReadableType="StructuredActivityNodeContent"
+		type="7008">
+	</mapping>
+
+	<mapping
+		humanReadableType="StructuredActivityNodeContent"
+		type="7009">
+	</mapping>
+
+	<mapping
+		humanReadableType="StructuredActivityNodeContent"
+		type="7010">
+	</mapping>
+
+	<mapping
+		humanReadableType="StructuredActivityNodeContent"
+		type="7012">
+	</mapping>
+
+	<mapping
+		humanReadableType="StructuredActivityNodeContent"
+		type="7005">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityPartitionContent"
+		type="7006">
+	</mapping>
+
+	<mapping
+		humanReadableType="InterruptibleActivityRegionContent"
+		type="7007">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigureParameter"
+		type="7014">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigurePrecondition"
+		type="7015">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigurePostCondtion"
+		type="7016">
+	</mapping>
+
+	<mapping
+		humanReadableType="ActivityFigureContent"
+		type="7013">
+	</mapping>
+
+			
+	
+
+	
+
+	
+	<mapping
+		humanReadableType="Name"
+		type="6001">
+	</mapping>
+
+	<mapping
+		humanReadableType="Weight"
+		type="6002">
+	</mapping>
+
+	<mapping
+		humanReadableType="Selection"
+		type="6005">
+	</mapping>
+
+	<mapping
+		humanReadableType="Transformation"
+		type="6006">
+	</mapping>
+
+	<mapping
+		humanReadableType="DecisionInputFlow"
+		type="6007">
+	</mapping>
+
+	<mapping
+		humanReadableType="Guard"
+		type="6008">
+	</mapping>
+
+	<mapping
+		humanReadableType="Stereotype"
+		type="6010">
+	</mapping>
+
+
+	
+	<mapping
+		humanReadableType="Name"
+		type="6003">
+	</mapping>
+
+	<mapping
+		humanReadableType="Weight"
+		type="6004">
+	</mapping>
+
+	<mapping
+		humanReadableType="Guard"
+		type="6009">
+	</mapping>
+
+	<mapping
+		humanReadableType="Stereotype"
+		type="6011">
+	</mapping>
+
+
+	
+
+	
+
+	
+
+		</diagramMappings>
+	</extension>
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 64b3a0ca355..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.diagram.activity.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index 35a278c3d58..a5bb2577dfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -15,1328 +15,1308 @@
 -->
 <plugin> 
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

-
-<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer"/>

-   </extension>

-<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.clazz"

-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

-<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.clazz">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.clazz">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-         </propertySection>

-      </propertySections>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLClassDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025,4026,8500"/>

-      </viewProvider>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="false"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.clazz.custom.providers.CustomUMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLClassDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025,4026,8500"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="1,5066,5002,5005,5008,5011,5020,5023,5026,5161,5029,5032,5035,5037,5159,5038,0,5155,5156,5153,5154,5157,5040,5043,5046,5049,5052,5055,5017,5162,5014,5058,5061,5063,5064,5160"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="7011,7012,7013,7023,7024,7025,7026,7027,7028,7029,7041,7042,7032,7033,7030,7010,7031,7035,7017,7018,7019,7002,7003,7004,7006,7007,7008,7039,7040,7020,7021,7034,7001,7005,7009,7016,7015,7036,7037,7014,7038"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Dependency_2014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="2014"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.AssociationClass_2013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="AssociationClass"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AssociationClassEditHelper">

-            <param name="semanticHint" value="2013"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Association_2015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Association"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AssociationEditHelper">

-            <param name="semanticHint" value="2015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InstanceSpecification_2001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InstanceSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InstanceSpecificationEditHelper">

-            <param name="semanticHint" value="2001"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Component_2002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Component"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ComponentEditHelper">

-            <param name="semanticHint" value="2002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Signal_2003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Signal"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SignalEditHelper">

-            <param name="semanticHint" value="2003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interface_2004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="2004"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Model_2005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Model"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="2005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Enumeration_2006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>

-            <param name="semanticHint" value="2006"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Package_2007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>

-            <param name="semanticHint" value="2007"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InformationItem_2099"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InformationItem"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationItemEditHelper">

-            <param name="semanticHint" value="2099"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_2008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>

-            <param name="semanticHint" value="2008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.PrimitiveType_2009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>

-            <param name="semanticHint" value="2009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DataType_2010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>

-            <param name="semanticHint" value="2010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Constraint_2011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"/>

-            <param name="semanticHint" value="2011"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Comment_2012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"/>

-            <param name="semanticHint" value="2012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-         <metamodelType

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

-               name="%metatype.name.Diagram_2016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Diagram"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ShortCutDiagramEditHelper">

-            <param name="semanticHint" value="2016"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.DurationObservation_2095"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DurationObservationEditHelper">

-            <param name="semanticHint" value="2095"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.TimeObservation_2096"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TimeObservationEditHelper">

-            <param name="semanticHint" value="2096"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.NamedElement_2097"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="NamedElement"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DefaultNamedElementEditHelper">

-            <param name="semanticHint" value="2097"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Property_3012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-            <param name="semanticHint" value="3012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Property_3002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PropertyEditHelper">

-            <param name="semanticHint" value="3002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Property_3005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-            <param name="semanticHint" value="3005"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Property_3006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-            <param name="semanticHint" value="3006"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Property_3041"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-            <param name="semanticHint" value="3041"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Property_3018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-            <param name="semanticHint" value="3018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_3014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>

-            <param name="semanticHint" value="3014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Class_3004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Class"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassEditHelper">

-            <param name="semanticHint" value="3004"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_3008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>

-            <param name="semanticHint" value="3008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Operation_3013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>

-            <param name="semanticHint" value="3013"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Operation_3003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Operation"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.OperationEditHelper">

-            <param name="semanticHint" value="3003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Operation_3007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>

-            <param name="semanticHint" value="3007"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Operation_3042"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>

-            <param name="semanticHint" value="3042"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Operation_3019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>

-            <param name="semanticHint" value="3019"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ConnectableElementTemplateParameter_3034"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ConnectableElementTemplateParameter"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">

-            <param name="semanticHint" value="3034"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.OperationTemplateParameter_3035"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="OperationTemplateParameter"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">

-            <param name="semanticHint" value="3035"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ClassifierTemplateParameter_3031"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ClassifierTemplateParameter"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">

-            <param name="semanticHint" value="3031"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.TemplateParameter_3016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TemplateParameter"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TemplateParameterEditHelper">

-            <param name="semanticHint" value="3016"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.EnumerationLiteral_3017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="EnumerationLiteral"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.EnumerationLiteralEditHelper">

-            <param name="semanticHint" value="3017"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Reception_3011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Reception"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ReceptionEditHelper">

-            <param name="semanticHint" value="3011"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Reception_3039"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Reception"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ReceptionEditHelper">

-            <param name="semanticHint" value="3039"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Slot_3030"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Slot"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SlotEditHelper">

-            <param name="semanticHint" value="3030"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.RedefinableTemplateSignature_3015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="RedefinableTemplateSignature"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RedefinableTemplateSignatureEditHelper">

-            <param name="semanticHint" value="3015"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Node_3032"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="3032"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.TemplateSignature_3033"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TemplateSignature"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RedefinableTemplateSignatureEditHelper">

-            <param name="semanticHint" value="3033"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.InstanceSpecification_3020"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"/>

-            <param name="semanticHint" value="3020"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Component_3021"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"/>

-            <param name="semanticHint" value="3021"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Signal_3022"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

-            <param name="semanticHint" value="3022"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Interface_3023"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>

-            <param name="semanticHint" value="3023"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Model_3024"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"/>

-            <param name="semanticHint" value="3024"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Enumeration_3025"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Enumeration"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.EnumerationEditHelper">

-            <param name="semanticHint" value="3025"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Package_3009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>

-            <param name="semanticHint" value="3009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InformationItem_3040"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InformationItem"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationItemEditHelper">

-            <param name="semanticHint" value="3040"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_3010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>

-            <param name="semanticHint" value="3010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PrimitiveType_3026"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PrimitiveType"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PrimitiveTypeEditHelper">

-            <param name="semanticHint" value="3026"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.DataType_3027"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DataType"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DataTypeEditHelper">

-            <param name="semanticHint" value="3027"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_3028"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="3028"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_3029"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="3029"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Interface_3036"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>

-            <param name="semanticHint" value="3036"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interface_3037"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="3037"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Interface_3038"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"/>

-            <param name="semanticHint" value="3038"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Enumeration_3052"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>

-            <param name="semanticHint" value="3052"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Enumeration_3053"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>

-            <param name="semanticHint" value="3053"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Enumeration_3054"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>

-            <param name="semanticHint" value="3054"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.PrimitiveType_3047"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>

-            <param name="semanticHint" value="3047"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.PrimitiveType_3046"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>

-            <param name="semanticHint" value="3046"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.PrimitiveType_3048"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>

-            <param name="semanticHint" value="3048"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DataType_3044"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>

-            <param name="semanticHint" value="3044"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DataType_3045"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>

-            <param name="semanticHint" value="3045"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DataType_3043"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>

-            <param name="semanticHint" value="3043"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Signal_3050"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

-            <param name="semanticHint" value="3050"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Signal_3051"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

-            <param name="semanticHint" value="3051"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Signal_3049"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

-            <param name="semanticHint" value="3049"/>

-         </specializationType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Link_4016"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4016"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.AssociationClass_4017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"/>

-            <param name="semanticHint" value="4017"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Association_4001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>

-            <param name="semanticHint" value="4001"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Association_4019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>

-            <param name="semanticHint" value="4019"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_4002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InterfaceRealization_4003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InterfaceRealization"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceRealizationEditHelper">

-            <param name="semanticHint" value="4003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Substitution_4004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Substitution"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SubstitutionEditHelper">

-            <param name="semanticHint" value="4004"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Realization_4005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Realization"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RealizationEditHelper">

-            <param name="semanticHint" value="4005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Abstraction_4006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Abstraction"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AbstractionEditHelper">

-            <param name="semanticHint" value="4006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Usage_4007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Usage"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.UsageEditHelper">

-            <param name="semanticHint" value="4007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>

-            <param name="semanticHint" value="4008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>

-            <param name="semanticHint" value="4018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ElementImport_4009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ElementImport"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ElementImportEditHelper">

-            <param name="semanticHint" value="4009"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PackageImport_4010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PackageImport"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageImportEditHelper">

-            <param name="semanticHint" value="4010"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PackageMerge_4011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PackageMerge"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageMergeEditHelper">

-            <param name="semanticHint" value="4011"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ProfileApplication_4012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ProfileApplication"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ProfileApplicationEditHelper">

-            <param name="semanticHint" value="4012"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_4013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4013"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_4014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.TemplateBinding_4015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TemplateBinding"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TemplateBindingEditHelper">

-            <param name="semanticHint" value="4015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.GeneralizationSet_4020"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="GeneralizationSet"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.GeneralizationSetEditHelper">

-            <param name="semanticHint" value="4020"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InstanceSpecification_4021"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InstanceSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InstanceSpecificationLinkEditHelper">

-            <param name="semanticHint" value="4021"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Link_4022"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4022"/>

-      </specializationType>

-      <specializationType

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

-            name="%metatype.name.Link_4023"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4023"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.TimeObservationEvent_4024"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4024"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DurationObservationEvent_4025"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4025"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InformationFlow_4026"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InformationFlow"

-               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationFlowEditHelper">

-            <param name="semanticHint" value="4026"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintContext_8500"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8500"/>

-         </specializationType>

-      </metamodel>

-   </extension>

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

-      <?gmfgen generated="false"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.clazz.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.clazz.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3041"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Component_3021"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Model_3024"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_4001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_4019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500"/>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
+
+<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer"/>
+   </extension>
+<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.clazz"
+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.clazz">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.clazz">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.clazz.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+            <input type="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+         </propertySection>
+      </propertySections>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLClassDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025,4026,8500"/>
+      </viewProvider>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="false"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.clazz.custom.providers.CustomUMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLClassDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2099,2008,2009,2010,2011,2012,2016,2095,2096,2097,3012,3002,3005,3006,3041,3018,3014,3004,3008,3013,3003,3007,3042,3019,3034,3035,3031,3016,3017,3011,3039,3030,3015,3032,3033,3020,3021,3022,3023,3024,3025,3009,3040,3010,3026,3027,3028,3029,3036,3037,3038,3052,3053,3054,3047,3046,3048,3044,3045,3043,3050,3051,3049"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021,4022,4023,4024,4025,4026,8500"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="1,5066,5002,5005,5008,5011,5020,5023,5026,5161,5029,5032,5035,5037,5159,5038,0,5155,5156,5153,5154,5157,5040,5043,5046,5049,5052,5055,5017,5162,5014,5058,5061,5063,5064,5160"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="7011,7012,7013,7023,7024,7025,7026,7027,7028,7029,7041,7042,7032,7033,7030,7010,7031,7035,7017,7018,7019,7002,7003,7004,7006,7007,7008,7039,7040,7020,7021,7034,7001,7005,7009,7016,7015,7036,7037,7014,7038"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"
+               name="%metatype.name.Dependency_2014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="2014"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"
+               name="%metatype.name.AssociationClass_2013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="AssociationClass"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AssociationClassEditHelper">
+            <param name="semanticHint" value="2013"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"
+               name="%metatype.name.Association_2015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Association"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AssociationEditHelper">
+            <param name="semanticHint" value="2015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"
+               name="%metatype.name.InstanceSpecification_2001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InstanceSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InstanceSpecificationEditHelper">
+            <param name="semanticHint" value="2001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"
+               name="%metatype.name.Component_2002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Component"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ComponentEditHelper">
+            <param name="semanticHint" value="2002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"
+               name="%metatype.name.Signal_2003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Signal"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SignalEditHelper">
+            <param name="semanticHint" value="2003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"
+               name="%metatype.name.Interface_2004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="2004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"
+               name="%metatype.name.Model_2005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Model"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="2005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"
+               name="%metatype.name.Enumeration_2006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>
+            <param name="semanticHint" value="2006"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"
+               name="%metatype.name.Package_2007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>
+            <param name="semanticHint" value="2007"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099"
+               name="%metatype.name.InformationItem_2099"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InformationItem"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationItemEditHelper">
+            <param name="semanticHint" value="2099"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"
+               name="%metatype.name.Class_2008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>
+            <param name="semanticHint" value="2008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"
+               name="%metatype.name.PrimitiveType_2009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>
+            <param name="semanticHint" value="2009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"
+               name="%metatype.name.DataType_2010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>
+            <param name="semanticHint" value="2010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"
+               name="%metatype.name.Constraint_2011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"/>
+            <param name="semanticHint" value="2011"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"
+               name="%metatype.name.Comment_2012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"/>
+            <param name="semanticHint" value="2012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"
+               name="%metatype.name.Diagram_2016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Diagram"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ShortCutDiagramEditHelper">
+            <param name="semanticHint" value="2016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"
+               name="%metatype.name.DurationObservation_2095"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DurationObservationEditHelper">
+            <param name="semanticHint" value="2095"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"
+               name="%metatype.name.TimeObservation_2096"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TimeObservationEditHelper">
+            <param name="semanticHint" value="2096"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"
+               name="%metatype.name.NamedElement_2097"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="NamedElement"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DefaultNamedElementEditHelper">
+            <param name="semanticHint" value="2097"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3012"
+               name="%metatype.name.Property_3012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+            <param name="semanticHint" value="3012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"
+               name="%metatype.name.Property_3002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="3002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3005"
+               name="%metatype.name.Property_3005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+            <param name="semanticHint" value="3005"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3006"
+               name="%metatype.name.Property_3006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+            <param name="semanticHint" value="3006"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3041"
+               name="%metatype.name.Property_3041"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+            <param name="semanticHint" value="3041"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Property_3018"
+               name="%metatype.name.Property_3018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+            <param name="semanticHint" value="3018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Class_3014"
+               name="%metatype.name.Class_3014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>
+            <param name="semanticHint" value="3014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"
+               name="%metatype.name.Class_3004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Class"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassEditHelper">
+            <param name="semanticHint" value="3004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Class_3008"
+               name="%metatype.name.Class_3008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>
+            <param name="semanticHint" value="3008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"
+               name="%metatype.name.Operation_3013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>
+            <param name="semanticHint" value="3013"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"
+               name="%metatype.name.Operation_3003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Operation"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.OperationEditHelper">
+            <param name="semanticHint" value="3003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"
+               name="%metatype.name.Operation_3007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>
+            <param name="semanticHint" value="3007"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042"
+               name="%metatype.name.Operation_3042"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>
+            <param name="semanticHint" value="3042"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"
+               name="%metatype.name.Operation_3019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>
+            <param name="semanticHint" value="3019"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"
+               name="%metatype.name.ConnectableElementTemplateParameter_3034"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ConnectableElementTemplateParameter"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">
+            <param name="semanticHint" value="3034"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"
+               name="%metatype.name.OperationTemplateParameter_3035"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="OperationTemplateParameter"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">
+            <param name="semanticHint" value="3035"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"
+               name="%metatype.name.ClassifierTemplateParameter_3031"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ClassifierTemplateParameter"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ClassifierTemplateParameterEditHelper">
+            <param name="semanticHint" value="3031"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"
+               name="%metatype.name.TemplateParameter_3016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TemplateParameter"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TemplateParameterEditHelper">
+            <param name="semanticHint" value="3016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"
+               name="%metatype.name.EnumerationLiteral_3017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="EnumerationLiteral"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.EnumerationLiteralEditHelper">
+            <param name="semanticHint" value="3017"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"
+               name="%metatype.name.Reception_3011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Reception"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ReceptionEditHelper">
+            <param name="semanticHint" value="3011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"
+               name="%metatype.name.Reception_3039"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Reception"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ReceptionEditHelper">
+            <param name="semanticHint" value="3039"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"
+               name="%metatype.name.Slot_3030"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Slot"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SlotEditHelper">
+            <param name="semanticHint" value="3030"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"
+               name="%metatype.name.RedefinableTemplateSignature_3015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="RedefinableTemplateSignature"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RedefinableTemplateSignatureEditHelper">
+            <param name="semanticHint" value="3015"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"
+            name="%metatype.name.Node_3032"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="3032"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"
+               name="%metatype.name.TemplateSignature_3033"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TemplateSignature"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RedefinableTemplateSignatureEditHelper">
+            <param name="semanticHint" value="3033"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"
+               name="%metatype.name.InstanceSpecification_3020"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"/>
+            <param name="semanticHint" value="3020"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Component_3021"
+               name="%metatype.name.Component_3021"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"/>
+            <param name="semanticHint" value="3021"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"
+               name="%metatype.name.Signal_3022"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>
+            <param name="semanticHint" value="3022"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"
+               name="%metatype.name.Interface_3023"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>
+            <param name="semanticHint" value="3023"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Model_3024"
+               name="%metatype.name.Model_3024"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"/>
+            <param name="semanticHint" value="3024"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"
+               name="%metatype.name.Enumeration_3025"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Enumeration"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.EnumerationEditHelper">
+            <param name="semanticHint" value="3025"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"
+               name="%metatype.name.Package_3009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>
+            <param name="semanticHint" value="3009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040"
+               name="%metatype.name.InformationItem_3040"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InformationItem"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationItemEditHelper">
+            <param name="semanticHint" value="3040"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Class_3010"
+               name="%metatype.name.Class_3010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>
+            <param name="semanticHint" value="3010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"
+               name="%metatype.name.PrimitiveType_3026"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PrimitiveType"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PrimitiveTypeEditHelper">
+            <param name="semanticHint" value="3026"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"
+               name="%metatype.name.DataType_3027"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DataType"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.DataTypeEditHelper">
+            <param name="semanticHint" value="3027"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"
+               name="%metatype.name.Comment_3028"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="3028"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"
+               name="%metatype.name.Constraint_3029"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="3029"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"
+               name="%metatype.name.Interface_3036"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>
+            <param name="semanticHint" value="3036"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"
+               name="%metatype.name.Interface_3037"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="3037"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"
+               name="%metatype.name.Interface_3038"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"/>
+            <param name="semanticHint" value="3038"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"
+               name="%metatype.name.Enumeration_3052"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>
+            <param name="semanticHint" value="3052"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053"
+               name="%metatype.name.Enumeration_3053"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>
+            <param name="semanticHint" value="3053"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054"
+               name="%metatype.name.Enumeration_3054"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>
+            <param name="semanticHint" value="3054"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"
+               name="%metatype.name.PrimitiveType_3047"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>
+            <param name="semanticHint" value="3047"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046"
+               name="%metatype.name.PrimitiveType_3046"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>
+            <param name="semanticHint" value="3046"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048"
+               name="%metatype.name.PrimitiveType_3048"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>
+            <param name="semanticHint" value="3048"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"
+               name="%metatype.name.DataType_3044"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>
+            <param name="semanticHint" value="3044"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045"
+               name="%metatype.name.DataType_3045"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>
+            <param name="semanticHint" value="3045"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043"
+               name="%metatype.name.DataType_3043"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>
+            <param name="semanticHint" value="3043"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"
+               name="%metatype.name.Signal_3050"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>
+            <param name="semanticHint" value="3050"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"
+               name="%metatype.name.Signal_3051"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>
+            <param name="semanticHint" value="3051"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"
+               name="%metatype.name.Signal_3049"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>
+            <param name="semanticHint" value="3049"/>
+         </specializationType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"
+            name="%metatype.name.Link_4016"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4016"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"
+               name="%metatype.name.AssociationClass_4017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"/>
+            <param name="semanticHint" value="4017"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Association_4001"
+               name="%metatype.name.Association_4001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>
+            <param name="semanticHint" value="4001"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Association_4019"
+               name="%metatype.name.Association_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>
+            <param name="semanticHint" value="4019"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"
+               name="%metatype.name.Generalization_4002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"
+               name="%metatype.name.InterfaceRealization_4003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InterfaceRealization"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InterfaceRealizationEditHelper">
+            <param name="semanticHint" value="4003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"
+               name="%metatype.name.Substitution_4004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Substitution"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.SubstitutionEditHelper">
+            <param name="semanticHint" value="4004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"
+               name="%metatype.name.Realization_4005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Realization"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.RealizationEditHelper">
+            <param name="semanticHint" value="4005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"
+               name="%metatype.name.Abstraction_4006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Abstraction"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.AbstractionEditHelper">
+            <param name="semanticHint" value="4006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"
+               name="%metatype.name.Usage_4007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Usage"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.UsageEditHelper">
+            <param name="semanticHint" value="4007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"
+               name="%metatype.name.Dependency_4008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
+            <param name="semanticHint" value="4008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"
+               name="%metatype.name.Dependency_4018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
+            <param name="semanticHint" value="4018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"
+               name="%metatype.name.ElementImport_4009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ElementImport"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ElementImportEditHelper">
+            <param name="semanticHint" value="4009"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"
+               name="%metatype.name.PackageImport_4010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PackageImport"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageImportEditHelper">
+            <param name="semanticHint" value="4010"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"
+               name="%metatype.name.PackageMerge_4011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PackageMerge"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.PackageMergeEditHelper">
+            <param name="semanticHint" value="4011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"
+               name="%metatype.name.ProfileApplication_4012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ProfileApplication"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.ProfileApplicationEditHelper">
+            <param name="semanticHint" value="4012"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"
+               name="%metatype.name.CommentAnnotatedElement_4013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4013"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"
+               name="%metatype.name.ConstraintConstrainedElement_4014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"
+               name="%metatype.name.TemplateBinding_4015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TemplateBinding"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.TemplateBindingEditHelper">
+            <param name="semanticHint" value="4015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"
+               name="%metatype.name.GeneralizationSet_4020"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="GeneralizationSet"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.GeneralizationSetEditHelper">
+            <param name="semanticHint" value="4020"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"
+               name="%metatype.name.InstanceSpecification_4021"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InstanceSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InstanceSpecificationLinkEditHelper">
+            <param name="semanticHint" value="4021"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"
+            name="%metatype.name.Link_4022"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4022"/>
+      </specializationType>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"
+            name="%metatype.name.Link_4023"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4023"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"
+               name="%metatype.name.TimeObservationEvent_4024"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4024"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"
+               name="%metatype.name.DurationObservationEvent_4025"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4025"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026"
+               name="%metatype.name.InformationFlow_4026"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InformationFlow"
+               edithelper="org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.InformationFlowEditHelper">
+            <param name="semanticHint" value="4026"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500"
+               name="%metatype.name.ConstraintContext_8500"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8500"/>
+         </specializationType>
+      </metamodel>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="false"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.clazz.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.clazz.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.clazz.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_2015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Component_2002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Model_2005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3041"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Property_3018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Component_3021"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Model_3024"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Class_3010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_4001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Association_4019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500"/>
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-         <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/>

-      </binding>

-   </extension>

-<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

-      <?gmfgen generated="true"?>

-      <propertyTester

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

-            type="org.eclipse.emf.common.ui.URIEditorInput"

-            namespace="org.eclipse.papyrus.uml.diagram.clazz"

-            properties="isURIEditorInput"

-            class="org.eclipse.papyrus.uml.diagram.clazz.part.UMLUriEditorInputTester">

-      </propertyTester>

-   </extension>

-<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

-      <?gmfgen generated="true"?>

-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.resourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"/>

-         </includes>

-      </viewerContentBinding>

-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"/>

-         </includes>

-      </viewerActionBinding>

-   </extension>

-<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

-      <?gmfgen generated="true"?>

-      <navigatorContent

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

-            name="%navigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </possibleChildren>

-         <commonSorter 

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

-               class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorSorter">

-            <parentExpression>

-               <or>

-                  <and>

-                     <instanceof value="org.eclipse.core.resources.IFile"/>

-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>

-                  </and>

-                  <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-               </or>

-            </parentExpression>

-         </commonSorter>

-      </navigatorContent>

-      <navigatorContent

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

-            name="%domainNavigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>

-         </possibleChildren>

-      </navigatorContent>

-      <actionProvider

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

-            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorActionProvider">

-         <enablement>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </enablement>

-      </actionProvider>

-   </extension>

-<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

-      <?gmfgen generated="true"?>

-      <linkHelper

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

-            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLinkHelper">

-         <editorInputEnablement>

-            <and>

-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

-               <test property="org.eclipse.papyrus.uml.diagram.clazz.isURIEditorInput"/>

-            </and>

-         </editorInputEnablement>

-         <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>

-         </selectionEnablement>

-      </linkHelper>

-   </extension>

-<extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

-<extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.clazz.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

-=======
-<extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.part.LoadResourceAction"/>

-   </extension>

->>>>>>> refs/heads/master
-    
+         <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/>
+      </binding>
+   </extension>
+<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+      <propertyTester
+            id="org.eclipse.papyrus.uml.diagram.clazz.URIEditorInputPropertyTester"
+            type="org.eclipse.emf.common.ui.URIEditorInput"
+            namespace="org.eclipse.papyrus.uml.diagram.clazz"
+            properties="isURIEditorInput"
+            class="org.eclipse.papyrus.uml.diagram.clazz.part.UMLUriEditorInputTester">
+      </propertyTester>
+   </extension>
+<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.resourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
+<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.clazz.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="org.eclipse.papyrus.uml.diagram.clazz.navigatorSorter" 
+               class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorSorter">
+            <parentExpression>
+               <or>
+                  <and>
+                     <instanceof value="org.eclipse.core.resources.IFile"/>
+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass_diagram"/>
+                  </and>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.clazz.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLClass"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorActionProvider"
+            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
+<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="org.eclipse.papyrus.uml.diagram.clazz.navigatorLinkHelper"
+            class="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="org.eclipse.papyrus.uml.diagram.clazz.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
+<extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.clazz.part.LoadResourceAction"/>
+   </extension>
 <extension point="org.eclipse.ui.commands">
 	<command
             categoryId="org.eclipse.papyrus.editor.category"
@@ -1527,65 +1507,62 @@
          </action>
       </objectContribution>
 </extension>
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

-      name="PapyrusUMLClassDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"

-      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

-
-<extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-
-
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.clazz.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

-
-<extension id="diagnostic" name="PapyrusUMLClassDiagram problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
+      name="PapyrusUMLClassDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLClassDiagram"
+      class="org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
+
+<extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.clazz.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.clazz.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+<extension id="diagnostic" name="PapyrusUMLClassDiagram problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
 				   </extension><extension
       point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
    <ParserProvider
@@ -1594,751 +1571,751 @@
             name="Medium">
       </Priority>
    </ParserProvider>
-</extension>

-<extension

-			id="PapyrusUMLClassDiagram.palettedefinition"

-			name="PapyrusUMLClassDiagram Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create a new Class"

-				      id="clazz.tool.class"

-				      kind="tool"

-				      label="Class"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a ClassifiertemplateParameter"

-				      id="clazz.tool.classifiertemplateparameter"

-				      kind="tool"

-				      label="ClassifierTemplateParameter"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a comment"

-				      id="clazz.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a component"

-				      id="clazz.tool.component"

-				      kind="tool"

-				      label="Component"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a constraint"

-				      id="clazz.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a new DataType"

-				      id="clazz.tool.datatype"

-				      kind="tool"

-				      label="DataType"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new DurationObservation"

-				      id="createDurationObservation7CreationTool"

-				      kind="tool"

-				      label="DurationObservation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an enumeration"

-				      id="clazz.tool.enumeration"

-				      kind="tool"

-				      label="Enumeration"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an enumeration literal"

-				      id="clazz.tool.enumerationliteral"

-				      kind="tool"

-				      label="Enumeration literal"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an interface"

-				      id="clazz.tool.interface"

-				      kind="tool"

-				      label="Interface"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an InstanceSpecification"

-				      id="clazz.tool.instancespecification"

-				      kind="tool"

-				      label="InstanceSpecification"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an InformationItem"

-				      id="clazz.tool.informationitem"

-				      kind="tool"

-				      label="InformationItem"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Primitivetype"

-				      id="clazz.tool.primitivetype"

-				      kind="tool"

-				      label="PrimitiveType"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a model"

-				      id="clazz.tool.model"

-				      kind="tool"

-				      label="Model"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an operation"

-				      id="clazz.tool.operation"

-				      kind="tool"

-				      label="Operation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an OperationTemplateParameter"

-				      id="clazz.tool.OperationTemplateParameter"

-				      kind="tool"

-				      label="OperationTemplateParameter"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Package"

-				      id="clazz.tool.package"

-				      kind="tool"

-				      label="Package"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a new Property"

-				      id="clazz.tool.property"

-				      kind="tool"

-				      label="Property"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a reception"

-				      id="clazz.tool.reception"

-				      kind="tool"

-				      label="Reception"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a RedefinableTemplateSignature"

-				      id="clazz.tool.redefinabletemplatesignature"

-				      kind="tool"

-				      label="RedefinableTemplateSignature"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a signal"

-				      id="clazz.tool.signal"

-				      kind="tool"

-				      label="Signal"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Slot"

-				      id="clazz.tool.slot"

-				      kind="tool"

-				      label="Slot"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a templateParameter"

-				      id="clazz.tool.templateparameter"

-				      kind="tool"

-				      label="TemplateParameter"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a TemplateSignature"

-				      id="clazz.tool.templatesignature"

-				      kind="tool"

-				      label="TemplateSignature"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new TimeObservation"

-				      id="createTimeObservation22CreationTool"

-				      kind="tool"

-				      label="TimeObservation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a ConnectableElementTemplateParameter"

-				      id="clazz.tool.connectableelementtemplateparameter"

-				      kind="tool"

-				      label="ConnectableElementTemplateParameter"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Abstraction"

-				      id="clazz.tool.abstraction"

-				      kind="tool"

-				      label="Abstraction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an association"

-				      id="clazz.tool.association"

-				      kind="tool"

-				      label="Association"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an association branch"

-				      id="clazz.tool.associationbranch"

-				      kind="tool"

-				      label="AssociationBranch"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="AssociationClass"

-				      id="clazz.tool.associationclass"

-				      kind="tool"

-				      label="AssociationClass"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a ContainmentLink"

-				      id="clazz.tool.containmentlink"

-				      kind="tool"

-				      label="ContainmentLink"

-				      large_icon="icons/obj16/ContainmentConnection.gif"

-				      path=""

-				      small_icon="icons/obj16/ContainmentConnection.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a context link for a Constraint"

-				      id="createContextLink6CreationTool"

-				      kind="tool"

-				      label="ContextLink"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a dependency"

-				      id="clazz.tool.dependency"

-				      kind="tool"

-				      label="Dependency"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a dependency branch"

-				      id="clazz.tool.dependencybranch"

-				      kind="tool"

-				      label="DependencyBranch"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a  elementImport"

-				      id="clazz.tool.elementimport"

-				      kind="tool"

-				      label="ElementImport"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description=" Create a generalization"

-				      id="clazz.tool.generalization"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="GeneralizationSet"

-				      id="clazz.tool.generalizationset"

-				      kind="tool"

-				      label="GeneralizationSet"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an InformationFlow link"

-				      id="clazz.tool.informationflowlink"

-				      kind="tool"

-				      label="InformationFlow link"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an InstanceSpecification link"

-				      id="clazz.tool.instancespecificationlink"

-				      kind="tool"

-				      label="InstanceSpecification link"

-				      large_icon="icons/obj16/InstanceLink.gif"

-				      path=""

-				      small_icon="icons/obj16/InstanceLink.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an InterfaceRealization"

-				      id="clazz.tool.interfacerealization"

-				      kind="tool"

-				      label="InterfaceRealization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"

-				      id="clazz.tool.link"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description=" Create a packageImport"

-				      id="clazz.tool.packageimport"

-				      kind="tool"

-				      label="PackageImport"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a packageMerge"

-				      id="clazz.tool.packagemerge"

-				      kind="tool"

-				      label="PackageMerge"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a profileApplication"

-				      id="clazz.tool.profileapplication"

-				      kind="tool"

-				      label="ProfileApplication"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Realization"

-				      id="clazz.tool.realization"

-				      kind="tool"

-				      label="Realization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a substitution"

-				      id="clazz.tool.substitution"

-				      kind="tool"

-				      label="Substitution"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a TemplateBinding"

-				      id="clazz.tool.templatebinding"

-				      kind="tool"

-				      label="TemplateBinding"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Usage"

-				      id="clazz.tool.usage"

-				      kind="tool"

-				      label="Usage"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

-

-<extension

-	id="PapyrusUMLClassDiagram.standard"

-	name="PapyrusUMLClassDiagram Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Nodes"

-		      id="clazz.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="clazz.tool.class"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.classifiertemplateparameter"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.comment"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.component"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.constraint"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.datatype"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createDurationObservation7CreationTool"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.enumeration"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.enumerationliteral"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.interface"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.instancespecification"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.informationitem"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.primitivetype"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.model"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.operation"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.OperationTemplateParameter"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.package"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.property"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.reception"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.redefinabletemplatesignature"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.signal"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.slot"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.templateparameter"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.templatesignature"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createTimeObservation22CreationTool"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.connectableelementtemplateparameter"

-		        path="/clazz.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Edges"

-		      id="clazz.group.relationships"

-		      kind="drawer"

-		      label="Edges"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="clazz.tool.abstraction"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.association"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.associationbranch"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.associationclass"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.containmentlink"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createContextLink6CreationTool"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.dependency"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.dependencybranch"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.elementimport"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.generalization"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.generalizationset"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.informationflowlink"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.instancespecificationlink"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.interfacerealization"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.link"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.packageimport"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.packagemerge"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.profileapplication"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.realization"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.substitution"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.templatebinding"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="clazz.tool.usage"

-		        path="/clazz.group.relationships">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

-

+</extension>
+<extension
+			id="PapyrusUMLClassDiagram.palettedefinition"
+			name="PapyrusUMLClassDiagram Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create a new Class"
+				      id="clazz.tool.class"
+				      kind="tool"
+				      label="Class"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a ClassifiertemplateParameter"
+				      id="clazz.tool.classifiertemplateparameter"
+				      kind="tool"
+				      label="ClassifierTemplateParameter"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ClassifierTemplateParameter.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a comment"
+				      id="clazz.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a component"
+				      id="clazz.tool.component"
+				      kind="tool"
+				      label="Component"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a constraint"
+				      id="clazz.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a new DataType"
+				      id="clazz.tool.datatype"
+				      kind="tool"
+				      label="DataType"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new DurationObservation"
+				      id="createDurationObservation7CreationTool"
+				      kind="tool"
+				      label="DurationObservation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an enumeration"
+				      id="clazz.tool.enumeration"
+				      kind="tool"
+				      label="Enumeration"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an enumeration literal"
+				      id="clazz.tool.enumerationliteral"
+				      kind="tool"
+				      label="Enumeration literal"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an interface"
+				      id="clazz.tool.interface"
+				      kind="tool"
+				      label="Interface"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an InstanceSpecification"
+				      id="clazz.tool.instancespecification"
+				      kind="tool"
+				      label="InstanceSpecification"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an InformationItem"
+				      id="clazz.tool.informationitem"
+				      kind="tool"
+				      label="InformationItem"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Primitivetype"
+				      id="clazz.tool.primitivetype"
+				      kind="tool"
+				      label="PrimitiveType"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a model"
+				      id="clazz.tool.model"
+				      kind="tool"
+				      label="Model"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an operation"
+				      id="clazz.tool.operation"
+				      kind="tool"
+				      label="Operation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an OperationTemplateParameter"
+				      id="clazz.tool.OperationTemplateParameter"
+				      kind="tool"
+				      label="OperationTemplateParameter"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OperationTemplateParameter.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Package"
+				      id="clazz.tool.package"
+				      kind="tool"
+				      label="Package"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a new Property"
+				      id="clazz.tool.property"
+				      kind="tool"
+				      label="Property"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a reception"
+				      id="clazz.tool.reception"
+				      kind="tool"
+				      label="Reception"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a RedefinableTemplateSignature"
+				      id="clazz.tool.redefinabletemplatesignature"
+				      kind="tool"
+				      label="RedefinableTemplateSignature"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/RedefinableTemplateSignature.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a signal"
+				      id="clazz.tool.signal"
+				      kind="tool"
+				      label="Signal"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Slot"
+				      id="clazz.tool.slot"
+				      kind="tool"
+				      label="Slot"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a templateParameter"
+				      id="clazz.tool.templateparameter"
+				      kind="tool"
+				      label="TemplateParameter"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameter.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a TemplateSignature"
+				      id="clazz.tool.templatesignature"
+				      kind="tool"
+				      label="TemplateSignature"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateSignature.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new TimeObservation"
+				      id="createTimeObservation22CreationTool"
+				      kind="tool"
+				      label="TimeObservation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a ConnectableElementTemplateParameter"
+				      id="clazz.tool.connectableelementtemplateparameter"
+				      kind="tool"
+				      label="ConnectableElementTemplateParameter"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectableElementTemplateParameter.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Abstraction"
+				      id="clazz.tool.abstraction"
+				      kind="tool"
+				      label="Abstraction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an association"
+				      id="clazz.tool.association"
+				      kind="tool"
+				      label="Association"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an association branch"
+				      id="clazz.tool.associationbranch"
+				      kind="tool"
+				      label="AssociationBranch"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="AssociationClass"
+				      id="clazz.tool.associationclass"
+				      kind="tool"
+				      label="AssociationClass"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/AssociationClass.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a ContainmentLink"
+				      id="clazz.tool.containmentlink"
+				      kind="tool"
+				      label="ContainmentLink"
+				      large_icon="icons/obj16/ContainmentConnection.gif"
+				      path=""
+				      small_icon="icons/obj16/ContainmentConnection.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a context link for a Constraint"
+				      id="createContextLink6CreationTool"
+				      kind="tool"
+				      label="ContextLink"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a dependency"
+				      id="clazz.tool.dependency"
+				      kind="tool"
+				      label="Dependency"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a dependency branch"
+				      id="clazz.tool.dependencybranch"
+				      kind="tool"
+				      label="DependencyBranch"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a  elementImport"
+				      id="clazz.tool.elementimport"
+				      kind="tool"
+				      label="ElementImport"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ElementImport.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description=" Create a generalization"
+				      id="clazz.tool.generalization"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="GeneralizationSet"
+				      id="clazz.tool.generalizationset"
+				      kind="tool"
+				      label="GeneralizationSet"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralizationSet.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an InformationFlow link"
+				      id="clazz.tool.informationflowlink"
+				      kind="tool"
+				      label="InformationFlow link"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an InstanceSpecification link"
+				      id="clazz.tool.instancespecificationlink"
+				      kind="tool"
+				      label="InstanceSpecification link"
+				      large_icon="icons/obj16/InstanceLink.gif"
+				      path=""
+				      small_icon="icons/obj16/InstanceLink.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an InterfaceRealization"
+				      id="clazz.tool.interfacerealization"
+				      kind="tool"
+				      label="InterfaceRealization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"
+				      id="clazz.tool.link"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description=" Create a packageImport"
+				      id="clazz.tool.packageimport"
+				      kind="tool"
+				      label="PackageImport"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a packageMerge"
+				      id="clazz.tool.packagemerge"
+				      kind="tool"
+				      label="PackageMerge"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a profileApplication"
+				      id="clazz.tool.profileapplication"
+				      kind="tool"
+				      label="ProfileApplication"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Realization"
+				      id="clazz.tool.realization"
+				      kind="tool"
+				      label="Realization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a substitution"
+				      id="clazz.tool.substitution"
+				      kind="tool"
+				      label="Substitution"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a TemplateBinding"
+				      id="clazz.tool.templatebinding"
+				      kind="tool"
+				      label="TemplateBinding"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateBinding.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Usage"
+				      id="clazz.tool.usage"
+				      kind="tool"
+				      label="Usage"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
+
+<extension
+	id="PapyrusUMLClassDiagram.standard"
+	name="PapyrusUMLClassDiagram Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.clazz.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Nodes"
+		      id="clazz.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="clazz.tool.class"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.classifiertemplateparameter"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.comment"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.component"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.constraint"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.datatype"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createDurationObservation7CreationTool"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.enumeration"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.enumerationliteral"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.interface"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.instancespecification"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.informationitem"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.primitivetype"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.model"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.operation"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.OperationTemplateParameter"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.package"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.property"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.reception"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.redefinabletemplatesignature"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.signal"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.slot"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.templateparameter"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.templatesignature"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createTimeObservation22CreationTool"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.connectableelementtemplateparameter"
+		        path="/clazz.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Edges"
+		      id="clazz.group.relationships"
+		      kind="drawer"
+		      label="Edges"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="clazz.tool.abstraction"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.association"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.associationbranch"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.associationclass"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.containmentlink"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createContextLink6CreationTool"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.dependency"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.dependencybranch"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.elementimport"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.generalization"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.generalizationset"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.informationflowlink"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.instancespecificationlink"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.interfacerealization"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.link"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.packageimport"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.packagemerge"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.profileapplication"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.realization"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.substitution"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.templatebinding"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="clazz.tool.usage"
+		        path="/clazz.group.relationships">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.clazz"/>
+	</paletteProvider>	
+		
+</extension>
+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
+
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
 
@@ -2915,5 +2892,14 @@
 
 		</diagramMappings>
 	</extension>
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
+
+
+
+
+
+
 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 38c493286e3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.clazz.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
index 3697cef3dc4..172df25d7e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
@@ -45,545 +45,528 @@
    </extension>
 
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.communication.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.communication.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
 
-<extension id="diagnostic" name="org.eclipse.papyrus.uml.diagram.communication problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension>   <extension

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

-			name="org.eclipse.papyrus.uml.diagram.communication Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.communication.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create a Lifeline"

-				      id="communication.tool.lifeline"

-				      kind="tool"

-				      label="Lifeline"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Comment"

-				      id="communication.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a constraint"

-				      id="communication.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Duration Observation on a Message"

-				      id="communication.tool.durationobservation"

-				      kind="tool"

-				      label="Duration Observation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Time Observation"

-				      id="communication.tool.timeobservation"

-				      kind="tool"

-				      label="Time Observation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="MessageCreate"

-				      id="createMessageCreateCreationTool"

-				      kind="tool"

-				      label="Message"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"

-				      id="createLink13CreationTool"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

+<extension id="diagnostic" name="org.eclipse.papyrus.uml.diagram.communication problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension>   <extension
+			id="org.eclipse.papyrus.uml.diagram.communication.palettedefinition"
+			name="org.eclipse.papyrus.uml.diagram.communication Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.communication.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create a Lifeline"
+				      id="communication.tool.lifeline"
+				      kind="tool"
+				      label="Lifeline"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Comment"
+				      id="communication.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a constraint"
+				      id="communication.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Duration Observation on a Message"
+				      id="communication.tool.durationobservation"
+				      kind="tool"
+				      label="Duration Observation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Time Observation"
+				      id="communication.tool.timeobservation"
+				      kind="tool"
+				      label="Time Observation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="MessageCreate"
+				      id="createMessageCreateCreationTool"
+				      kind="tool"
+				      label="Message"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a link for comment, constraint, TimeObservation, DurationObservation"
+				      id="createLink13CreationTool"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
 
-<extension

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

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

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.communication.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Nodes"

-		      id="communication.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="communication.tool.lifeline"

-		        path="/communication.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="communication.tool.comment"

-		        path="/communication.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="communication.tool.constraint"

-		        path="/communication.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="communication.tool.durationobservation"

-		        path="/communication.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="communication.tool.timeobservation"

-		        path="/communication.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Edges tools"

-		      id="createEdges2Group"

-		      kind="drawer"

-		      label="Edges"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createMessageCreateCreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createLink13CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

+<extension
+	id="org.eclipse.papyrus.uml.diagram.communication.standard"
+	name="org.eclipse.papyrus.uml.diagram.communication Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.communication.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Nodes"
+		      id="communication.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="communication.tool.lifeline"
+		        path="/communication.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="communication.tool.comment"
+		        path="/communication.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="communication.tool.constraint"
+		        path="/communication.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="communication.tool.durationobservation"
+		        path="/communication.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="communication.tool.timeobservation"
+		        path="/communication.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Edges tools"
+		      id="createEdges2Group"
+		      kind="drawer"
+		      label="Edges"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createMessageCreateCreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createLink13CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.communication"/>
+	</paletteProvider>	
+		
+</extension>
 
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"

-      name="PapyrusUMLCommunicationDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"

-      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"

-      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+      name="PapyrusUMLCommunicationDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+      class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
 
-<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLCommunicationDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="8002,8016,8001,8004,8005,8006,8007"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="8009,8010,8011,8012,8013"/>

-      </viewProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLCommunicationDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="8002,8016,8001,8004,8005,8006,8007"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="8009,8010,8011,8012,8013"/>
+      </viewProvider>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="true"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLCommunicationDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="8002,8016,8001,8004,8005,8006,8007"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="8009,8010,8011,8012,8013"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="5001,0,5002,5064,5160,5150,5153,5154,5155,5156"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="7001"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLCommunicationDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="8002,8016,8001,8004,8005,8006,8007"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="8009,8010,8011,8012,8013"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="5001,0,5002,5064,5160,5150,5153,5154,5155,5156"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="7001"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
 
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLIconProvider">

-         <Priority name="Lowest"/>

-      </IconProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLIconProvider">
+         <Priority name="Lowest"/>
+      </IconProvider>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interaction_8002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interaction"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper">

-            <param name="semanticHint" value="8002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-         <metamodelType

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

-               name="%metatype.name.Diagram_8016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Diagram"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ShortCutDiagramEditHelper">

-            <param name="semanticHint" value="8016"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Lifeline_8001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Lifeline"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper">

-            <param name="semanticHint" value="8001"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_8004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="8004"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_8005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="8005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.TimeObservation_8006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper">

-            <param name="semanticHint" value="8006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.DurationObservation_8007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper">

-            <param name="semanticHint" value="8007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Message_8009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Message"

-               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper">

-            <param name="semanticHint" value="8009"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_8010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_8011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8011"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DurationObservationEvent_8012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.TimeObservationEvent_8013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8013"/>

-         </specializationType>

-      </metamodel>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Interaction_8002"
+               name="%metatype.name.Interaction_8002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interaction"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper">
+            <param name="semanticHint" value="8002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Diagram_8016"
+               name="%metatype.name.Diagram_8016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Diagram"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ShortCutDiagramEditHelper">
+            <param name="semanticHint" value="8016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Lifeline_8001"
+               name="%metatype.name.Lifeline_8001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Lifeline"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper">
+            <param name="semanticHint" value="8001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Constraint_8004"
+               name="%metatype.name.Constraint_8004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="8004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Comment_8005"
+               name="%metatype.name.Comment_8005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="8005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_8006"
+               name="%metatype.name.TimeObservation_8006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper">
+            <param name="semanticHint" value="8006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_8007"
+               name="%metatype.name.DurationObservation_8007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper">
+            <param name="semanticHint" value="8007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.communication.Message_8009"
+               name="%metatype.name.Message_8009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Message"
+               edithelper="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper">
+            <param name="semanticHint" value="8009"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.communication.CommentAnnotatedElement_8010"
+               name="%metatype.name.CommentAnnotatedElement_8010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.communication.ConstraintConstrainedElement_8011"
+               name="%metatype.name.ConstraintConstrainedElement_8011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8011"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.communication.DurationObservationEvent_8012"
+               name="%metatype.name.DurationObservationEvent_8012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.communication.TimeObservationEvent_8013"
+               name="%metatype.name.TimeObservationEvent_8013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8013"/>
+         </specializationType>
+      </metamodel>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.communication.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.communication.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Interaction_8002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Diagram_8016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Lifeline_8001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Constraint_8004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Comment_8005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_8006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_8007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Message_8009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.CommentAnnotatedElement_8010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.ConstraintConstrainedElement_8011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservationEvent_8012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservationEvent_8013"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.communication.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.communication.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.communication.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Interaction_8002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Diagram_8016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Lifeline_8001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Constraint_8004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Comment_8005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_8006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_8007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Message_8009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.CommentAnnotatedElement_8010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.ConstraintConstrainedElement_8011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservationEvent_8012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservationEvent_8013"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
 
-<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

-      <?gmfgen generated="true"?>

-      <propertyTester

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

-            type="org.eclipse.emf.common.ui.URIEditorInput"

-            namespace="org.eclipse.papyrus.uml.diagram.communication"

-            properties="isURIEditorInput"

-            class="org.eclipse.papyrus.uml.diagram.communication.part.UMLUriEditorInputTester">

-      </propertyTester>

-   </extension>

+<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+      <propertyTester
+            id="org.eclipse.papyrus.uml.diagram.communication.URIEditorInputPropertyTester"
+            type="org.eclipse.emf.common.ui.URIEditorInput"
+            namespace="org.eclipse.papyrus.uml.diagram.communication"
+            properties="isURIEditorInput"
+            class="org.eclipse.papyrus.uml.diagram.communication.part.UMLUriEditorInputTester">
+      </propertyTester>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

-      <?gmfgen generated="true"?>

-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.resourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.domainResourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorLinkHelper"/>

-         </includes>

-      </viewerContentBinding>

-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorActionProvider"/>

-         </includes>

-      </viewerActionBinding>

-   </extension>

+<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.resourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.domainResourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

-      <?gmfgen generated="true"?>

-      <navigatorContent

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

-            name="%navigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication_diagram"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </possibleChildren>

-         <commonSorter 

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

-               class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorSorter">

-            <parentExpression>

-               <or>

-                  <and>

-                     <instanceof value="org.eclipse.core.resources.IFile"/>

-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication_diagram"/>

-                  </and>

-                  <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>

-               </or>

-            </parentExpression>

-         </commonSorter>

-      </navigatorContent>

-      <navigatorContent

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

-            name="%domainNavigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorItem"/>

-         </possibleChildren>

-      </navigatorContent>

-      <actionProvider

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

-            class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorActionProvider">

-         <enablement>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </enablement>

-      </actionProvider>

-   </extension>

+<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.communication.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication_diagram"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="org.eclipse.papyrus.uml.diagram.communication.navigatorSorter" 
+               class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorSorter">
+            <parentExpression>
+               <or>
+                  <and>
+                     <instanceof value="org.eclipse.core.resources.IFile"/>
+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication_diagram"/>
+                  </and>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.communication.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLCommunication"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="org.eclipse.papyrus.uml.diagram.communication.navigatorActionProvider"
+            class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

-      <?gmfgen generated="true"?>

-      <linkHelper

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

-            class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorLinkHelper">

-         <editorInputEnablement>

-            <and>

-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

-               <test property="org.eclipse.papyrus.uml.diagram.communication.isURIEditorInput"/>

-            </and>

-         </editorInputEnablement>

-         <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>

-         </selectionEnablement>

-      </linkHelper>

-   </extension>

+<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="org.eclipse.papyrus.uml.diagram.communication.navigatorLinkHelper"
+            class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="org.eclipse.papyrus.uml.diagram.communication.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
 
-<extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

 
-<extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.communication.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.communication.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

 
 <extension
       id="ep-provider"
@@ -612,15 +595,15 @@
         
    </editpartProvider>
 </extension>
-<extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.communication.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+<extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.communication.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
 <extension
       point="org.eclipse.ui.popupMenus">
    <objectContribution
@@ -638,13 +621,13 @@
       </action>
    </objectContribution>
 </extension>
-<extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-   </extension>

+<extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+   </extension>
 
 <extension
       point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
@@ -701,14 +684,14 @@
      
    </metamodel>
 </extension>
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
 	<diagramMappings diagramID="PapyrusUMLCommunicationDiagram">
 		<mapping type="PapyrusUMLCommunicationDiagram" humanReadableType="CommunicationDiagram"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 5854149ce46..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.communication.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index a75efdfc539..090d84fbdcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -134,612 +134,595 @@
    </extension>
 
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.component.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.component.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
 	
-   <extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

-      name="PapyrusUMLComponentDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

+   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
+      name="PapyrusUMLComponentDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.component"

-            labelProvider="org.eclipse.papyrus.uml.diagram.component.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.component"
+            labelProvider="org.eclipse.papyrus.uml.diagram.component.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.component">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.component">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.component">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.component.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-      </propertySections>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.component">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.component.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+      </propertySections>
+   </extension>
 
 
-	<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+	<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>

-      </viewProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
+      </viewProvider>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="true"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLComponentDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0,5268"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLComponentDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0,5268"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
 
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
 
    
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Dependency_3203"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="3203"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Component_2002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Component"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentEditHelper">

-            <param name="semanticHint" value="2002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Model_3202"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Model"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="3202"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_3200"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="3200"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interface_3205"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="3205"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_3201"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="3201"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_3199"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="3199"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.NamedElement_3204"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="NamedElement"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DefaultNamedElementEditHelper">

-            <param name="semanticHint" value="3204"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interface_2003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="2003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Port_3069"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Port"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PortEditHelper">

-            <param name="semanticHint" value="3069"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Model_3077"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Model"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="3077"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_3076"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="3076"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Interface_3078"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="3078"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Component_3070"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>

-            <param name="semanticHint" value="3070"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Component_3071"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>

-            <param name="semanticHint" value="3071"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Comment_3074"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>

-            <param name="semanticHint" value="3074"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Constraint_3075"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>

-            <param name="semanticHint" value="3075"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Property_1"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">

-            <param name="semanticHint" value="1"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Operation_5"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Operation"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.OperationEditHelper">

-            <param name="semanticHint" value="5"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Reception_6"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Reception"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ReceptionEditHelper">

-            <param name="semanticHint" value="6"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Interface_3072"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>

-            <param name="semanticHint" value="3072"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Property_3079"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">

-            <param name="semanticHint" value="3079"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Usage_4001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Usage"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.UsageEditHelper">

-            <param name="semanticHint" value="4001"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.InterfaceRealization_4006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InterfaceRealization"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceRealizationEditHelper">

-            <param name="semanticHint" value="4006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_4003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Substitution_4012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Substitution"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.SubstitutionEditHelper">

-            <param name="semanticHint" value="4012"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Manifestation_4014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Manifestation"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ManifestationEditHelper">

-            <param name="semanticHint" value="4014"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ComponentRealization_4007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ComponentRealization"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentRealizationEditHelper">

-            <param name="semanticHint" value="4007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Abstraction_4013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Abstraction"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.AbstractionEditHelper">

-            <param name="semanticHint" value="4013"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Link_4016"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4016"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_4015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4015"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_4009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>

-            <param name="semanticHint" value="4010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyBranchLink">

-            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>

-            <param name="semanticHint" value="4017"/>

-         </specializationType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Link_4018"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4018"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Connector_4019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Connector"

-               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConnectorEditHelper">

-            <param name="semanticHint" value="4019"/>

-         </metamodelType>

-      </metamodel>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Model_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"
+               name="%metatype.name.Dependency_3203"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="3203"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Component_2002"
+               name="%metatype.name.Component_2002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Component"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentEditHelper">
+            <param name="semanticHint" value="2002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Model_3202"
+               name="%metatype.name.Model_3202"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Model"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="3202"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Package_3200"
+               name="%metatype.name.Package_3200"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="3200"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Interface_3205"
+               name="%metatype.name.Interface_3205"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="3205"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Comment_3201"
+               name="%metatype.name.Comment_3201"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="3201"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Comment_3199"
+               name="%metatype.name.Constraint_3199"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="3199"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"
+               name="%metatype.name.NamedElement_3204"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="NamedElement"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DefaultNamedElementEditHelper">
+            <param name="semanticHint" value="3204"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Interface_2003"
+               name="%metatype.name.Interface_2003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="2003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Port_3069"
+               name="%metatype.name.Port_3069"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Port"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PortEditHelper">
+            <param name="semanticHint" value="3069"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Model_3077"
+               name="%metatype.name.Model_3077"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Model"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="3077"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Package_3076"
+               name="%metatype.name.Package_3076"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="3076"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Interface_3078"
+               name="%metatype.name.Interface_3078"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="3078"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Component_3070"
+               name="%metatype.name.Component_3070"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
+            <param name="semanticHint" value="3070"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Component_3071"
+               name="%metatype.name.Component_3071"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
+            <param name="semanticHint" value="3071"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Comment_3074"
+               name="%metatype.name.Comment_3074"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>
+            <param name="semanticHint" value="3074"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"
+               name="%metatype.name.Constraint_3075"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>
+            <param name="semanticHint" value="3075"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Property_1"
+               name="%metatype.name.Property_1"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="1"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Operation_5"
+               name="%metatype.name.Operation_5"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Operation"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.OperationEditHelper">
+            <param name="semanticHint" value="5"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Reception_6"
+               name="%metatype.name.Reception_6"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Reception"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ReceptionEditHelper">
+            <param name="semanticHint" value="6"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Interface_3072"
+               name="%metatype.name.Interface_3072"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>
+            <param name="semanticHint" value="3072"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Property_3079"
+               name="%metatype.name.Property_3079"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="3079"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Usage_4001"
+               name="%metatype.name.Usage_4001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Usage"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.UsageEditHelper">
+            <param name="semanticHint" value="4001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"
+               name="%metatype.name.InterfaceRealization_4006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InterfaceRealization"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.InterfaceRealizationEditHelper">
+            <param name="semanticHint" value="4006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"
+               name="%metatype.name.Generalization_4003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"
+               name="%metatype.name.Substitution_4012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Substitution"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.SubstitutionEditHelper">
+            <param name="semanticHint" value="4012"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"
+               name="%metatype.name.Manifestation_4014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Manifestation"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ManifestationEditHelper">
+            <param name="semanticHint" value="4014"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"
+               name="%metatype.name.ComponentRealization_4007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ComponentRealization"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ComponentRealizationEditHelper">
+            <param name="semanticHint" value="4007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"
+               name="%metatype.name.Abstraction_4013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Abstraction"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.AbstractionEditHelper">
+            <param name="semanticHint" value="4013"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.component.Link_4016"
+            name="%metatype.name.Link_4016"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4016"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"
+               name="%metatype.name.CommentAnnotatedElement_4015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4015"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"
+               name="%metatype.name.ConstraintConstrainedElement_4009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"
+               name="%metatype.name.Dependency_4010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
+            <param name="semanticHint" value="4010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"
+               name="%metatype.name.Dependency_4017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.component.edit.helpers.DependencyBranchLink">
+            <specializes id="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
+            <param name="semanticHint" value="4017"/>
+         </specializationType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.component.Link_4018"
+            name="%metatype.name.Link_4018"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4018"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Connector_4019"
+               name="%metatype.name.Connector_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Connector"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConnectorEditHelper">
+            <param name="semanticHint" value="4019"/>
+         </metamodelType>
+      </metamodel>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.component.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3202"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3200"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3205"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Port_3069"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3077"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3076"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3078"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3070"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3071"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3074"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_1"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Operation_5"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Reception_6"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3072"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_3079"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Usage_4001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Connector_4019"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.component.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.component.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_2002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3202"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3200"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3205"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3201"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3199"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_2003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Port_3069"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Model_3077"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Package_3076"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3078"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3070"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Component_3071"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Comment_3074"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_1"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Operation_5"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Reception_6"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3072"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_3079"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Usage_4001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Connector_4019"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
 	   
 	   
       
-	      <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.component.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.component.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

 
-   <extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
 
-   <extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.component.part.LoadResourceAction"/>

-   </extension>

+   <extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.component.part.LoadResourceAction"/>
+   </extension>
 
-   <extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

+   <extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
 
 
 
@@ -758,395 +741,395 @@
    
    
    
-<extension

-			id="Papyrus Component Diagram .palettedefinition"

-			name="Papyrus Component Diagram  Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create a Constraint"

-				      id="component.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Comment"

-				      id="component.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Component"

-				      id="component.tool.component"

-				      kind="tool"

-				      label="Component"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Interface"

-				      id="component.tool.interface"

-				      kind="tool"

-				      label="Interface"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a model"

-				      id="component.tool.model"

-				      kind="tool"

-				      label="Model"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Property"

-				      id="component.tool.property"

-				      kind="tool"

-				      label="Property"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Operation"

-				      id="component.tool.operation"

-				      kind="tool"

-				      label="Operation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Package"

-				      id="component.tool.package"

-				      kind="tool"

-				      label="Package"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Port"

-				      id="component.tool.port"

-				      kind="tool"

-				      label="Port"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Reception"

-				      id="component.tool.reception"

-				      kind="tool"

-				      label="Reception"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Link (Comment / Constraint)"

-				      id="component.tool.link"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Connector"

-				      id="component.tool.connector"

-				      kind="tool"

-				      label="Connector"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Dependency"

-				      id="component.tool.dependency"

-				      kind="tool"

-				      label="Dependency"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a dependency branch"

-				      id="component.tool.dependencybranch"

-				      kind="tool"

-				      label="DependencyBranch"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Abstraction"

-				      id="component.tool.abstraction"

-				      kind="tool"

-				      label="Abstraction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Manifestation"

-				      id="component.tool.manifestation"

-				      kind="tool"

-				      label="Manifestation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Generalization link"

-				      id="component.tool.generalization"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Usage"

-				      id="component.tool.usage"

-				      kind="tool"

-				      label="Usage"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Substitution"

-				      id="component.tool.substitution"

-				      kind="tool"

-				      label="Substitution"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Interface Realization"

-				      id="component.tool.interfaceRealization"

-				      kind="tool"

-				      label="Interface Realization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Component Realization"

-				      id="component.tool.componentRealization"

-				      kind="tool"

-				      label="Component Realization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

+<extension
+			id="Papyrus Component Diagram .palettedefinition"
+			name="Papyrus Component Diagram  Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create a Constraint"
+				      id="component.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Comment"
+				      id="component.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Component"
+				      id="component.tool.component"
+				      kind="tool"
+				      label="Component"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Interface"
+				      id="component.tool.interface"
+				      kind="tool"
+				      label="Interface"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a model"
+				      id="component.tool.model"
+				      kind="tool"
+				      label="Model"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Property"
+				      id="component.tool.property"
+				      kind="tool"
+				      label="Property"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Operation"
+				      id="component.tool.operation"
+				      kind="tool"
+				      label="Operation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Package"
+				      id="component.tool.package"
+				      kind="tool"
+				      label="Package"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Port"
+				      id="component.tool.port"
+				      kind="tool"
+				      label="Port"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Reception"
+				      id="component.tool.reception"
+				      kind="tool"
+				      label="Reception"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Link (Comment / Constraint)"
+				      id="component.tool.link"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Connector"
+				      id="component.tool.connector"
+				      kind="tool"
+				      label="Connector"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Dependency"
+				      id="component.tool.dependency"
+				      kind="tool"
+				      label="Dependency"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a dependency branch"
+				      id="component.tool.dependencybranch"
+				      kind="tool"
+				      label="DependencyBranch"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Abstraction"
+				      id="component.tool.abstraction"
+				      kind="tool"
+				      label="Abstraction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Manifestation"
+				      id="component.tool.manifestation"
+				      kind="tool"
+				      label="Manifestation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Generalization link"
+				      id="component.tool.generalization"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Usage"
+				      id="component.tool.usage"
+				      kind="tool"
+				      label="Usage"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Substitution"
+				      id="component.tool.substitution"
+				      kind="tool"
+				      label="Substitution"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Interface Realization"
+				      id="component.tool.interfaceRealization"
+				      kind="tool"
+				      label="Interface Realization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Component Realization"
+				      id="component.tool.componentRealization"
+				      kind="tool"
+				      label="Component Realization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
 
-<extension

-	id="Papyrus Component Diagram .standard"

-	name="Papyrus Component Diagram  Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Diagram Nodes"

-		      id="component.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="component.tool.constraint"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.comment"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.component"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.interface"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.model"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.property"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.operation"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.package"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.port"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.reception"

-		        path="/component.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Diagram Links"

-		      id="component.group.links"

-		      kind="drawer"

-		      label="Links"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="component.tool.link"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.connector"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.dependency"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.dependencybranch"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.abstraction"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.manifestation"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.generalization"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.usage"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.substitution"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.interfaceRealization"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="component.tool.componentRealization"

-		        path="/component.group.links">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

+<extension
+	id="Papyrus Component Diagram .standard"
+	name="Papyrus Component Diagram  Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Diagram Nodes"
+		      id="component.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="component.tool.constraint"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.comment"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.component"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.interface"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.model"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.property"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.operation"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.package"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.port"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.reception"
+		        path="/component.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Diagram Links"
+		      id="component.group.links"
+		      kind="drawer"
+		      label="Links"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="component.tool.link"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.connector"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.dependency"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.dependencybranch"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.abstraction"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.manifestation"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.generalization"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.usage"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.substitution"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.interfaceRealization"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="component.tool.componentRealization"
+		        path="/component.group.links">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.component"/>
+	</paletteProvider>	
+		
+</extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
 
 
 
    <!-- optionally, specify keybindings -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.component.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.component.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
 
-<extension id="diagnostic" name="Papyrus Component Diagram  problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

+<extension id="diagnostic" name="Papyrus Component Diagram  problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
 <extension
       point="org.eclipse.ui.commands">
    <command
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index cb23c455947..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.component.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 71bbabc8655..2f3ae9f4124 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -15,22 +15,22 @@
 -->
 <plugin>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
       	
 
 
-   <extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
    <extension point="org.eclipse.ui.preferencePages" id="prefpages">
       <?gmfgen generated="false"?>
@@ -57,77 +57,77 @@
 
    </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.composite"

-            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-      </propertySections>

-   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>

-      </viewProvider>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.composite"
+            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+      </propertySections>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>
+      </viewProvider>
+   </extension>
 
    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
@@ -153,1175 +153,1158 @@
    </extension>
 
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Package_1000"

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"

-               name="%metatype.name.Activity_2060"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Activity"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActivityEditHelper">

-            <param name="semanticHint" value="2060"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"

-               name="%metatype.name.Interaction_2061"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interaction"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionEditHelper">

-            <param name="semanticHint" value="2061"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"

-               name="%metatype.name.ProtocolStateMachine_2062"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ProtocolStateMachine"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ProtocolStateMachineEditHelper">

-            <param name="semanticHint" value="2062"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"

-               name="%metatype.name.StateMachine_2063"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="StateMachine"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StateMachineEditHelper">

-            <param name="semanticHint" value="2063"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"

-               name="%metatype.name.FunctionBehavior_2064"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="FunctionBehavior"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.FunctionBehaviorEditHelper">

-            <param name="semanticHint" value="2064"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"

-               name="%metatype.name.OpaqueBehavior_2065"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="OpaqueBehavior"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueBehaviorEditHelper">

-            <param name="semanticHint" value="2065"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"

-               name="%metatype.name.Component_2069"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Component"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentEditHelper">

-            <param name="semanticHint" value="2069"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"

-               name="%metatype.name.Device_2070"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Device"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeviceEditHelper">

-            <param name="semanticHint" value="2070"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"

-               name="%metatype.name.ExecutionEnvironment_2071"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ExecutionEnvironment"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExecutionEnvironmentEditHelper">

-            <param name="semanticHint" value="2071"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"

-               name="%metatype.name.Node_2072"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Node"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.NodeEditHelper">

-            <param name="semanticHint" value="2072"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"

-               name="%metatype.name.Class_2073"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Class"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ClassEditHelper">

-            <param name="semanticHint" value="2073"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"

-               name="%metatype.name.Collaboration_2075"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>

-            <param name="semanticHint" value="2075"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"

-               name="%metatype.name.Interface_2076"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>

-            <param name="semanticHint" value="2076"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"

-               name="%metatype.name.PrimitiveType_2066"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PrimitiveType"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PrimitiveTypeEditHelper">

-            <param name="semanticHint" value="2066"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"

-               name="%metatype.name.Enumeration_2067"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Enumeration"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationEditHelper">

-            <param name="semanticHint" value="2067"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"

-               name="%metatype.name.DataType_2068"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DataType"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DataTypeEditHelper">

-            <param name="semanticHint" value="2068"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"

-               name="%metatype.name.Actor_2077"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>

-            <param name="semanticHint" value="2077"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"

-               name="%metatype.name.DeploymentSpecification_2078"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>

-            <param name="semanticHint" value="2078"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"

-               name="%metatype.name.Artifact_2079"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>

-            <param name="semanticHint" value="2079"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"

-               name="%metatype.name.InformationItem_2080"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>

-            <param name="semanticHint" value="2080"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"

-               name="%metatype.name.Signal_2081"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>

-            <param name="semanticHint" value="2081"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"

-               name="%metatype.name.UseCase_2082"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>

-            <param name="semanticHint" value="2082"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"

-               name="%metatype.name.SignalEvent_2083"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="SignalEvent"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEventEditHelper">

-            <param name="semanticHint" value="2083"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"

-               name="%metatype.name.CallEvent_2084"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="CallEvent"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CallEventEditHelper">

-            <param name="semanticHint" value="2084"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"

-               name="%metatype.name.AnyReceiveEvent_2085"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="AnyReceiveEvent"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AnyReceiveEventEditHelper">

-            <param name="semanticHint" value="2085"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"

-               name="%metatype.name.ChangeEvent_2088"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ChangeEvent"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ChangeEventEditHelper">

-            <param name="semanticHint" value="2088"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"

-               name="%metatype.name.TimeEvent_2089"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeEvent"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeEventEditHelper">

-            <param name="semanticHint" value="2089"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"

-               name="%metatype.name.DurationObservation_2093"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationObservationEditHelper">

-            <param name="semanticHint" value="2093"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"

-               name="%metatype.name.TimeObservation_2094"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeObservationEditHelper">

-            <param name="semanticHint" value="2094"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"

-               name="%metatype.name.LiteralBoolean_2095"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="LiteralBoolean"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralBooleanEditHelper">

-            <param name="semanticHint" value="2095"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"

-               name="%metatype.name.LiteralInteger_2096"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="LiteralInteger"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralIntegerEditHelper">

-            <param name="semanticHint" value="2096"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"

-               name="%metatype.name.LiteralNull_2097"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="LiteralNull"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralNullEditHelper">

-            <param name="semanticHint" value="2097"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"

-               name="%metatype.name.LiteralString_2098"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="LiteralString"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralStringEditHelper">

-            <param name="semanticHint" value="2098"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"

-               name="%metatype.name.LiteralUnlimitedNatural_2099"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="LiteralUnlimitedNatural"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralUnlimitedNaturalEditHelper">

-            <param name="semanticHint" value="2099"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"

-               name="%metatype.name.StringExpression_2100"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="StringExpression"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StringExpressionEditHelper">

-            <param name="semanticHint" value="2100"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"

-               name="%metatype.name.OpaqueExpression_2101"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="OpaqueExpression"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueExpressionEditHelper">

-            <param name="semanticHint" value="2101"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"

-               name="%metatype.name.TimeExpression_2102"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeExpression"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeExpressionEditHelper">

-            <param name="semanticHint" value="2102"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"

-               name="%metatype.name.Expression_2103"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Expression"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExpressionEditHelper">

-            <param name="semanticHint" value="2103"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"

-               name="%metatype.name.Duration_2104"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Duration"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationEditHelper">

-            <param name="semanticHint" value="2104"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"

-               name="%metatype.name.TimeInterval_2105"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeInterval"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeIntervalEditHelper">

-            <param name="semanticHint" value="2105"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"

-               name="%metatype.name.DurationInterval_2106"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationInterval"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationIntervalEditHelper">

-            <param name="semanticHint" value="2106"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"

-               name="%metatype.name.Interval_2107"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interval"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalEditHelper">

-            <param name="semanticHint" value="2107"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"

-               name="%metatype.name.InstanceValue_2108"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InstanceValue"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InstanceValueEditHelper">

-            <param name="semanticHint" value="2108"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"

-               name="%metatype.name.Comment_2109"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>

-            <param name="semanticHint" value="2109"/>

-         </specializationType>

-      </metamodel>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"

-               name="%metatype.name.DurationConstraint_2110"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="2110"/>

-         </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"

-               name="%metatype.name.TimeConstraint_2111"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeConstraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeConstraintEditHelper">

-            <param name="semanticHint" value="2111"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"

-               name="%metatype.name.IntervalConstraint_2112"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="IntervalConstraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalConstraintEditHelper">

-            <param name="semanticHint" value="2112"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"

-               name="%metatype.name.InteractionConstraint_2113"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InteractionConstraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionConstraintEditHelper">

-            <param name="semanticHint" value="2113"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"

-               name="%metatype.name.Constraint_2114"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="2114"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.composite.Node_3121"

-            name="%metatype.name.Node_3121"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="3121"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Port_3069"

-               name="%metatype.name.Port_3069"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Port"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PortEditHelper">

-            <param name="semanticHint" value="3069"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"

-               name="%metatype.name.Parameter_3088"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Parameter"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ParameterEditHelper">

-            <param name="semanticHint" value="3088"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3070"

-               name="%metatype.name.Property_3070"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PropertyEditHelper">

-            <param name="semanticHint" value="3070"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"

-               name="%metatype.name.ConnectableElement_3115"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ConnectableElement"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationRoleEditHelper">

-            <param name="semanticHint" value="3115"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"

-               name="%metatype.name.CollaborationUse_3071"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="CollaborationUse"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationUseEditHelper">

-            <param name="semanticHint" value="3071"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"

-               name="%metatype.name.Activity_3072"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>

-            <param name="semanticHint" value="3072"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"

-               name="%metatype.name.Interaction_3073"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>

-            <param name="semanticHint" value="3073"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"

-               name="%metatype.name.ProtocolStateMachine_3074"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>

-            <param name="semanticHint" value="3074"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"

-               name="%metatype.name.StateMachine_3075"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>

-            <param name="semanticHint" value="3075"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"

-               name="%metatype.name.FunctionBehavior_3076"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>

-            <param name="semanticHint" value="3076"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"

-               name="%metatype.name.OpaqueBehavior_3077"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>

-            <param name="semanticHint" value="3077"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Component_3081"

-               name="%metatype.name.Component_3081"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>

-            <param name="semanticHint" value="3081"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Device_3082"

-               name="%metatype.name.Device_3082"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>

-            <param name="semanticHint" value="3082"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"

-               name="%metatype.name.ExecutionEnvironment_3083"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>

-            <param name="semanticHint" value="3083"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Node_3084"

-               name="%metatype.name.Node_3084"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>

-            <param name="semanticHint" value="3084"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Class_3085"

-               name="%metatype.name.Class_3085"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>

-            <param name="semanticHint" value="3085"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"

-               name="%metatype.name.Collaboration_3086"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Collaboration"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationEditHelper">

-            <param name="semanticHint" value="3086"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"

-               name="%metatype.name.Interface_3087"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interface"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceEditHelper">

-            <param name="semanticHint" value="3087"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"

-               name="%metatype.name.PrimitiveType_3078"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>

-            <param name="semanticHint" value="3078"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"

-               name="%metatype.name.Enumeration_3079"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>

-            <param name="semanticHint" value="3079"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"

-               name="%metatype.name.DataType_3080"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>

-            <param name="semanticHint" value="3080"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"

-               name="%metatype.name.Actor_3091"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Actor"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActorEditHelper">

-            <param name="semanticHint" value="3091"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"

-               name="%metatype.name.DeploymentSpecification_3092"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DeploymentSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentSpecificationEditHelper">

-            <param name="semanticHint" value="3092"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"

-               name="%metatype.name.Artifact_3093"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Artifact"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ArtifactEditHelper">

-            <param name="semanticHint" value="3093"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"

-               name="%metatype.name.InformationItem_3094"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InformationItem"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationItemEditHelper">

-            <param name="semanticHint" value="3094"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"

-               name="%metatype.name.Signal_3095"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Signal"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEditHelper">

-            <param name="semanticHint" value="3095"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"

-               name="%metatype.name.UseCase_3096"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="UseCase"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UseCaseEditHelper">

-            <param name="semanticHint" value="3096"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"

-               name="%metatype.name.Comment_3097"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="3097"/>

-         </metamodelType>

-      </metamodel>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"

-               name="%metatype.name.DurationConstraint_3116"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3116"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"

-               name="%metatype.name.TimeConstraint_3117"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3117"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"

-               name="%metatype.name.IntervalConstraint_3118"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3118"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"

-               name="%metatype.name.InteractionConstraint_3119"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3119"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"

-               name="%metatype.name.Constraint_3120"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3120"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3101"

-               name="%metatype.name.Property_3101"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3101"/>

-         </specializationType>

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"

-               name="%metatype.name.Operation_3102"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="3102"/>

-         </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"

-               name="%metatype.name.EnumerationLiteral_3066"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="EnumerationLiteral"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationLiteralEditHelper">

-            <param name="semanticHint" value="3066"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4022"

-            name="%metatype.name.Link_4022"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4022"/>

-      </specializationType>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4001"

-            name="%metatype.name.Link_4001"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4001"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"

-               name="%metatype.name.CommentAnnotatedElement_4002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4002"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"

-               name="%metatype.name.ConstraintConstrainedElement_4003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4003"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"

-               name="%metatype.name.ComponentRealization_4004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ComponentRealization"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentRealizationEditHelper">

-            <param name="semanticHint" value="4004"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"

-               name="%metatype.name.InterfaceRealization_4005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InterfaceRealization"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceRealizationEditHelper">

-            <param name="semanticHint" value="4005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"

-               name="%metatype.name.Substitution_4011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Substitution"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SubstitutionEditHelper">

-            <param name="semanticHint" value="4011"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"

-               name="%metatype.name.Realization_4006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Realization"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RealizationEditHelper">

-            <param name="semanticHint" value="4006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"

-               name="%metatype.name.Manifestation_4012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Manifestation"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ManifestationEditHelper">

-            <param name="semanticHint" value="4012"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"

-               name="%metatype.name.Abstraction_4007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Abstraction"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AbstractionEditHelper">

-            <param name="semanticHint" value="4007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"

-               name="%metatype.name.Usage_4008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Usage"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UsageEditHelper">

-            <param name="semanticHint" value="4008"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"

-               name="%metatype.name.Deployment_4009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Deployment"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentEditHelper">

-            <param name="semanticHint" value="4009"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"

-               name="%metatype.name.Dependency_4017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RoleBindingEditHelper">

-            <param name="semanticHint" value="4017"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"

-               name="%metatype.name.Dependency_4010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="4010"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"

-               name="%metatype.name.Connector_4013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Connector"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConnectorEditHelper">

-            <param name="semanticHint" value="4013"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"

-               name="%metatype.name.Generalization_4015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"

-               name="%metatype.name.TimeObservationEvent_4018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"

-               name="%metatype.name.DurationObservationEvent_4019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4019"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"

-               name="%metatype.name.InformationItemRepresented_4020"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4020"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"

-               name="%metatype.name.InformationFlow_4021"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="InformationFlow"

-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationFlowEditHelper">

-            <param name="semanticHint" value="4021"/>

-         </metamodelType>

-      </metamodel>

-   </extension>

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

-      <?gmfgen generated="true"?>

-      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"
+               name="%metatype.name.Activity_2060"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Activity"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActivityEditHelper">
+            <param name="semanticHint" value="2060"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"
+               name="%metatype.name.Interaction_2061"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interaction"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionEditHelper">
+            <param name="semanticHint" value="2061"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"
+               name="%metatype.name.ProtocolStateMachine_2062"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ProtocolStateMachine"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ProtocolStateMachineEditHelper">
+            <param name="semanticHint" value="2062"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"
+               name="%metatype.name.StateMachine_2063"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="StateMachine"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StateMachineEditHelper">
+            <param name="semanticHint" value="2063"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"
+               name="%metatype.name.FunctionBehavior_2064"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="FunctionBehavior"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.FunctionBehaviorEditHelper">
+            <param name="semanticHint" value="2064"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"
+               name="%metatype.name.OpaqueBehavior_2065"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="OpaqueBehavior"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueBehaviorEditHelper">
+            <param name="semanticHint" value="2065"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"
+               name="%metatype.name.Component_2069"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Component"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentEditHelper">
+            <param name="semanticHint" value="2069"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"
+               name="%metatype.name.Device_2070"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Device"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeviceEditHelper">
+            <param name="semanticHint" value="2070"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"
+               name="%metatype.name.ExecutionEnvironment_2071"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ExecutionEnvironment"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExecutionEnvironmentEditHelper">
+            <param name="semanticHint" value="2071"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"
+               name="%metatype.name.Node_2072"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Node"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.NodeEditHelper">
+            <param name="semanticHint" value="2072"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"
+               name="%metatype.name.Class_2073"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Class"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ClassEditHelper">
+            <param name="semanticHint" value="2073"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"
+               name="%metatype.name.Collaboration_2075"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
+            <param name="semanticHint" value="2075"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"
+               name="%metatype.name.Interface_2076"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
+            <param name="semanticHint" value="2076"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"
+               name="%metatype.name.PrimitiveType_2066"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PrimitiveType"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PrimitiveTypeEditHelper">
+            <param name="semanticHint" value="2066"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"
+               name="%metatype.name.Enumeration_2067"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Enumeration"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationEditHelper">
+            <param name="semanticHint" value="2067"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"
+               name="%metatype.name.DataType_2068"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DataType"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DataTypeEditHelper">
+            <param name="semanticHint" value="2068"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"
+               name="%metatype.name.Actor_2077"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
+            <param name="semanticHint" value="2077"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"
+               name="%metatype.name.DeploymentSpecification_2078"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
+            <param name="semanticHint" value="2078"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"
+               name="%metatype.name.Artifact_2079"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
+            <param name="semanticHint" value="2079"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"
+               name="%metatype.name.InformationItem_2080"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
+            <param name="semanticHint" value="2080"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"
+               name="%metatype.name.Signal_2081"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
+            <param name="semanticHint" value="2081"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"
+               name="%metatype.name.UseCase_2082"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
+            <param name="semanticHint" value="2082"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"
+               name="%metatype.name.SignalEvent_2083"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="SignalEvent"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEventEditHelper">
+            <param name="semanticHint" value="2083"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"
+               name="%metatype.name.CallEvent_2084"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="CallEvent"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CallEventEditHelper">
+            <param name="semanticHint" value="2084"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"
+               name="%metatype.name.AnyReceiveEvent_2085"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="AnyReceiveEvent"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AnyReceiveEventEditHelper">
+            <param name="semanticHint" value="2085"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"
+               name="%metatype.name.ChangeEvent_2088"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ChangeEvent"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ChangeEventEditHelper">
+            <param name="semanticHint" value="2088"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"
+               name="%metatype.name.TimeEvent_2089"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeEvent"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeEventEditHelper">
+            <param name="semanticHint" value="2089"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"
+               name="%metatype.name.DurationObservation_2093"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationObservationEditHelper">
+            <param name="semanticHint" value="2093"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"
+               name="%metatype.name.TimeObservation_2094"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeObservationEditHelper">
+            <param name="semanticHint" value="2094"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"
+               name="%metatype.name.LiteralBoolean_2095"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="LiteralBoolean"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralBooleanEditHelper">
+            <param name="semanticHint" value="2095"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"
+               name="%metatype.name.LiteralInteger_2096"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="LiteralInteger"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralIntegerEditHelper">
+            <param name="semanticHint" value="2096"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"
+               name="%metatype.name.LiteralNull_2097"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="LiteralNull"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralNullEditHelper">
+            <param name="semanticHint" value="2097"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"
+               name="%metatype.name.LiteralString_2098"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="LiteralString"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralStringEditHelper">
+            <param name="semanticHint" value="2098"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"
+               name="%metatype.name.LiteralUnlimitedNatural_2099"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="LiteralUnlimitedNatural"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralUnlimitedNaturalEditHelper">
+            <param name="semanticHint" value="2099"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"
+               name="%metatype.name.StringExpression_2100"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="StringExpression"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StringExpressionEditHelper">
+            <param name="semanticHint" value="2100"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"
+               name="%metatype.name.OpaqueExpression_2101"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="OpaqueExpression"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueExpressionEditHelper">
+            <param name="semanticHint" value="2101"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"
+               name="%metatype.name.TimeExpression_2102"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeExpression"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeExpressionEditHelper">
+            <param name="semanticHint" value="2102"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"
+               name="%metatype.name.Expression_2103"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Expression"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExpressionEditHelper">
+            <param name="semanticHint" value="2103"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"
+               name="%metatype.name.Duration_2104"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Duration"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationEditHelper">
+            <param name="semanticHint" value="2104"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"
+               name="%metatype.name.TimeInterval_2105"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeInterval"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeIntervalEditHelper">
+            <param name="semanticHint" value="2105"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"
+               name="%metatype.name.DurationInterval_2106"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationInterval"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationIntervalEditHelper">
+            <param name="semanticHint" value="2106"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"
+               name="%metatype.name.Interval_2107"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interval"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalEditHelper">
+            <param name="semanticHint" value="2107"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"
+               name="%metatype.name.InstanceValue_2108"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InstanceValue"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InstanceValueEditHelper">
+            <param name="semanticHint" value="2108"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"
+               name="%metatype.name.Comment_2109"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
+            <param name="semanticHint" value="2109"/>
+         </specializationType>
+      </metamodel>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"
+               name="%metatype.name.DurationConstraint_2110"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="2110"/>
+         </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"
+               name="%metatype.name.TimeConstraint_2111"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeConstraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeConstraintEditHelper">
+            <param name="semanticHint" value="2111"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"
+               name="%metatype.name.IntervalConstraint_2112"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="IntervalConstraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalConstraintEditHelper">
+            <param name="semanticHint" value="2112"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"
+               name="%metatype.name.InteractionConstraint_2113"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InteractionConstraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionConstraintEditHelper">
+            <param name="semanticHint" value="2113"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"
+               name="%metatype.name.Constraint_2114"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="2114"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.composite.Node_3121"
+            name="%metatype.name.Node_3121"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="3121"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Port_3069"
+               name="%metatype.name.Port_3069"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Port"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PortEditHelper">
+            <param name="semanticHint" value="3069"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"
+               name="%metatype.name.Parameter_3088"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Parameter"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ParameterEditHelper">
+            <param name="semanticHint" value="3088"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Property_3070"
+               name="%metatype.name.Property_3070"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="3070"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"
+               name="%metatype.name.ConnectableElement_3115"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ConnectableElement"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationRoleEditHelper">
+            <param name="semanticHint" value="3115"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"
+               name="%metatype.name.CollaborationUse_3071"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="CollaborationUse"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationUseEditHelper">
+            <param name="semanticHint" value="3071"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"
+               name="%metatype.name.Activity_3072"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
+            <param name="semanticHint" value="3072"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"
+               name="%metatype.name.Interaction_3073"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
+            <param name="semanticHint" value="3073"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"
+               name="%metatype.name.ProtocolStateMachine_3074"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
+            <param name="semanticHint" value="3074"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"
+               name="%metatype.name.StateMachine_3075"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
+            <param name="semanticHint" value="3075"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"
+               name="%metatype.name.FunctionBehavior_3076"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
+            <param name="semanticHint" value="3076"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"
+               name="%metatype.name.OpaqueBehavior_3077"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
+            <param name="semanticHint" value="3077"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Component_3081"
+               name="%metatype.name.Component_3081"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
+            <param name="semanticHint" value="3081"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Device_3082"
+               name="%metatype.name.Device_3082"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
+            <param name="semanticHint" value="3082"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"
+               name="%metatype.name.ExecutionEnvironment_3083"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
+            <param name="semanticHint" value="3083"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Node_3084"
+               name="%metatype.name.Node_3084"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
+            <param name="semanticHint" value="3084"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Class_3085"
+               name="%metatype.name.Class_3085"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
+            <param name="semanticHint" value="3085"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"
+               name="%metatype.name.Collaboration_3086"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Collaboration"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationEditHelper">
+            <param name="semanticHint" value="3086"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"
+               name="%metatype.name.Interface_3087"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interface"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceEditHelper">
+            <param name="semanticHint" value="3087"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"
+               name="%metatype.name.PrimitiveType_3078"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
+            <param name="semanticHint" value="3078"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"
+               name="%metatype.name.Enumeration_3079"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
+            <param name="semanticHint" value="3079"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"
+               name="%metatype.name.DataType_3080"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
+            <param name="semanticHint" value="3080"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"
+               name="%metatype.name.Actor_3091"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Actor"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActorEditHelper">
+            <param name="semanticHint" value="3091"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"
+               name="%metatype.name.DeploymentSpecification_3092"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DeploymentSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentSpecificationEditHelper">
+            <param name="semanticHint" value="3092"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"
+               name="%metatype.name.Artifact_3093"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Artifact"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ArtifactEditHelper">
+            <param name="semanticHint" value="3093"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"
+               name="%metatype.name.InformationItem_3094"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InformationItem"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationItemEditHelper">
+            <param name="semanticHint" value="3094"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"
+               name="%metatype.name.Signal_3095"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Signal"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEditHelper">
+            <param name="semanticHint" value="3095"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"
+               name="%metatype.name.UseCase_3096"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="UseCase"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UseCaseEditHelper">
+            <param name="semanticHint" value="3096"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"
+               name="%metatype.name.Comment_3097"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="3097"/>
+         </metamodelType>
+      </metamodel>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"
+               name="%metatype.name.DurationConstraint_3116"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3116"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"
+               name="%metatype.name.TimeConstraint_3117"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3117"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"
+               name="%metatype.name.IntervalConstraint_3118"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3118"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"
+               name="%metatype.name.InteractionConstraint_3119"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3119"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"
+               name="%metatype.name.Constraint_3120"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3120"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Property_3101"
+               name="%metatype.name.Property_3101"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3101"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"
+               name="%metatype.name.Operation_3102"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="3102"/>
+         </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"
+               name="%metatype.name.EnumerationLiteral_3066"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="EnumerationLiteral"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationLiteralEditHelper">
+            <param name="semanticHint" value="3066"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.composite.Link_4022"
+            name="%metatype.name.Link_4022"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4022"/>
+      </specializationType>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.composite.Link_4001"
+            name="%metatype.name.Link_4001"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4001"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"
+               name="%metatype.name.CommentAnnotatedElement_4002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4002"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"
+               name="%metatype.name.ConstraintConstrainedElement_4003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4003"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"
+               name="%metatype.name.ComponentRealization_4004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ComponentRealization"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentRealizationEditHelper">
+            <param name="semanticHint" value="4004"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"
+               name="%metatype.name.InterfaceRealization_4005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InterfaceRealization"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceRealizationEditHelper">
+            <param name="semanticHint" value="4005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"
+               name="%metatype.name.Substitution_4011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Substitution"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SubstitutionEditHelper">
+            <param name="semanticHint" value="4011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"
+               name="%metatype.name.Realization_4006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Realization"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RealizationEditHelper">
+            <param name="semanticHint" value="4006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"
+               name="%metatype.name.Manifestation_4012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Manifestation"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ManifestationEditHelper">
+            <param name="semanticHint" value="4012"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"
+               name="%metatype.name.Abstraction_4007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Abstraction"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AbstractionEditHelper">
+            <param name="semanticHint" value="4007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"
+               name="%metatype.name.Usage_4008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Usage"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UsageEditHelper">
+            <param name="semanticHint" value="4008"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"
+               name="%metatype.name.Deployment_4009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Deployment"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentEditHelper">
+            <param name="semanticHint" value="4009"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"
+               name="%metatype.name.Dependency_4017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RoleBindingEditHelper">
+            <param name="semanticHint" value="4017"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"
+               name="%metatype.name.Dependency_4010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="4010"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"
+               name="%metatype.name.Connector_4013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Connector"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConnectorEditHelper">
+            <param name="semanticHint" value="4013"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"
+               name="%metatype.name.Generalization_4015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"
+               name="%metatype.name.TimeObservationEvent_4018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"
+               name="%metatype.name.DurationObservationEvent_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4019"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"
+               name="%metatype.name.InformationItemRepresented_4020"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4020"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"
+               name="%metatype.name.InformationFlow_4021"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="InformationFlow"
+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationFlowEditHelper">
+            <param name="semanticHint" value="4021"/>
+         </metamodelType>
+      </metamodel>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
 	   
 	   
 	   
       
-	      <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

-         id="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"

-         name="%update.diagram.name"/>

-   </extension>

    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

    <extension
          point="org.eclipse.papyrus.infra.core.papyrusDiagram">
       <editorDiagram
@@ -1348,38 +1331,38 @@
             id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
             name="Create a new Composite Structure Diagram">
       </command>
-   </extension><extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-
-<extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>

-   </extension>

-
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

+   </extension><extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+<extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>
+   </extension>
+
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
 
 
 <extension
@@ -1393,27 +1376,27 @@
    </command>
 </extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

-
-<extension id="diagnostic" name="Papyrus Composite Structure Diagram  problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+<extension id="diagnostic" name="Papyrus Composite Structure Diagram  problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
    
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
@@ -1564,475 +1547,475 @@
 
 
 
-<extension

-			id="Papyrus Composite Structure Diagram .palettedefinition"

-			name="Papyrus Composite Structure Diagram  Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create new Class"

-				      id="composite.tool.class"

-				      kind="tool"

-				      label="Class"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Property"

-				      id="composite.tool.property"

-				      kind="tool"

-				      label="Property"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Port"

-				      id="composite.tool.port"

-				      kind="tool"

-				      label="Port"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Collaboration"

-				      id="composite.tool.collaboration"

-				      kind="tool"

-				      label="Collaboration"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new CollaborationRole"

-				      id="composite.tool.collaborationrole"

-				      kind="tool"

-				      label="CollaborationRole"

-				      large_icon="icons/obj16/CollaborationRole.gif"

-				      path=""

-				      small_icon="icons/obj16/CollaborationRole.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new CollaborationUse"

-				      id="composite.tool.collaborationuse"

-				      kind="tool"

-				      label="CollaborationUse"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Comment"

-				      id="composite.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Constraint"

-				      id="composite.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new TimeObservation"

-				      id="composite.tool.timeobservation"

-				      kind="tool"

-				      label="TimeObservation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new DurationObservation"

-				      id="composite.tool.durationobservation"

-				      kind="tool"

-				      label="DurationObservation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new InformationItem"

-				      id="composite.tool.informationitem"

-				      kind="tool"

-				      label="InformationItem"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Parameter"

-				      id="composite.tool.parameter"

-				      kind="tool"

-				      label="Parameter"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Activity"

-				      id="composite.tool.activity"

-				      kind="tool"

-				      label="Activity"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Interaction"

-				      id="composite.tool.interaction"

-				      kind="tool"

-				      label="Interaction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new ProtocolStateMachine"

-				      id="composite.tool.protocolstatemachine"

-				      kind="tool"

-				      label="ProtocolStateMachine"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new StateMachine"

-				      id="composite.tool.statemachine"

-				      kind="tool"

-				      label="StateMachine"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new FunctionBehavior"

-				      id="composite.tool.functionbehavior"

-				      kind="tool"

-				      label="FunctionBehavior"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new OpaqueBehavior"

-				      id="composite.tool.opaquebehavior"

-				      kind="tool"

-				      label="OpaqueBehavior"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Link (Comment / Constraint)"

-				      id="composite.tool.link"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Connector"

-				      id="composite.tool.connector"

-				      kind="tool"

-				      label="Connector"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new RoleBinding"

-				      id="composite.tool.rolebinding"

-				      kind="tool"

-				      label="RoleBinding"

-				      large_icon="icons/obj16/CollaborationRoleBinding.gif"

-				      path=""

-				      small_icon="icons/obj16/CollaborationRoleBinding.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Generalization"

-				      id="composite.tool.generalization"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Realization"

-				      id="composite.tool.realization"

-				      kind="tool"

-				      label="Realization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Substitution"

-				      id="composite.tool.substitution"

-				      kind="tool"

-				      label="Substitution"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Abstraction"

-				      id="composite.tool.abstraction"

-				      kind="tool"

-				      label="Abstraction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Usage"

-				      id="composite.tool.usage"

-				      kind="tool"

-				      label="Usage"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Dependency"

-				      id="composite.tool.dependency"

-				      kind="tool"

-				      label="Dependency"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new representation for an InformationItem"

-				      id="composite.tool.representation"

-				      kind="tool"

-				      label="Representation"

-				      large_icon="icons/obj16/Representation.gif"

-				      path=""

-				      small_icon="icons/obj16/Representation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new InformationFlow"

-				      id="composite.tool.informationflow"

-				      kind="tool"

-				      label="InformationFlow"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

-
-<extension

-	id="Papyrus Composite Structure Diagram .standard"

-	name="Papyrus Composite Structure Diagram  Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Nodes"

-		      id="composite.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="composite.tool.class"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.property"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.port"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.collaboration"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.collaborationrole"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.collaborationuse"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.comment"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.constraint"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.timeobservation"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.durationobservation"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.informationitem"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.parameter"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.activity"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.interaction"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.protocolstatemachine"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.statemachine"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.functionbehavior"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.opaquebehavior"

-		        path="/composite.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Edges"

-		      id="composite.group.edges"

-		      kind="drawer"

-		      label="Edges"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="composite.tool.link"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.connector"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.rolebinding"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.generalization"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.realization"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.substitution"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.abstraction"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.usage"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.dependency"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.representation"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="composite.tool.informationflow"

-		        path="/composite.group.edges">

-		  </predefinedEntry>

-		</contribution>

-		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>

-	</paletteProvider>	

-		

-</extension>

+<extension
+			id="Papyrus Composite Structure Diagram .palettedefinition"
+			name="Papyrus Composite Structure Diagram  Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create new Class"
+				      id="composite.tool.class"
+				      kind="tool"
+				      label="Class"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Property"
+				      id="composite.tool.property"
+				      kind="tool"
+				      label="Property"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Port"
+				      id="composite.tool.port"
+				      kind="tool"
+				      label="Port"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Collaboration"
+				      id="composite.tool.collaboration"
+				      kind="tool"
+				      label="Collaboration"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new CollaborationRole"
+				      id="composite.tool.collaborationrole"
+				      kind="tool"
+				      label="CollaborationRole"
+				      large_icon="icons/obj16/CollaborationRole.gif"
+				      path=""
+				      small_icon="icons/obj16/CollaborationRole.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new CollaborationUse"
+				      id="composite.tool.collaborationuse"
+				      kind="tool"
+				      label="CollaborationUse"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Comment"
+				      id="composite.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Constraint"
+				      id="composite.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new TimeObservation"
+				      id="composite.tool.timeobservation"
+				      kind="tool"
+				      label="TimeObservation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new DurationObservation"
+				      id="composite.tool.durationobservation"
+				      kind="tool"
+				      label="DurationObservation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new InformationItem"
+				      id="composite.tool.informationitem"
+				      kind="tool"
+				      label="InformationItem"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Parameter"
+				      id="composite.tool.parameter"
+				      kind="tool"
+				      label="Parameter"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Activity"
+				      id="composite.tool.activity"
+				      kind="tool"
+				      label="Activity"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Interaction"
+				      id="composite.tool.interaction"
+				      kind="tool"
+				      label="Interaction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new ProtocolStateMachine"
+				      id="composite.tool.protocolstatemachine"
+				      kind="tool"
+				      label="ProtocolStateMachine"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new StateMachine"
+				      id="composite.tool.statemachine"
+				      kind="tool"
+				      label="StateMachine"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new FunctionBehavior"
+				      id="composite.tool.functionbehavior"
+				      kind="tool"
+				      label="FunctionBehavior"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new OpaqueBehavior"
+				      id="composite.tool.opaquebehavior"
+				      kind="tool"
+				      label="OpaqueBehavior"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Link (Comment / Constraint)"
+				      id="composite.tool.link"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Connector"
+				      id="composite.tool.connector"
+				      kind="tool"
+				      label="Connector"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new RoleBinding"
+				      id="composite.tool.rolebinding"
+				      kind="tool"
+				      label="RoleBinding"
+				      large_icon="icons/obj16/CollaborationRoleBinding.gif"
+				      path=""
+				      small_icon="icons/obj16/CollaborationRoleBinding.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Generalization"
+				      id="composite.tool.generalization"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Realization"
+				      id="composite.tool.realization"
+				      kind="tool"
+				      label="Realization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Substitution"
+				      id="composite.tool.substitution"
+				      kind="tool"
+				      label="Substitution"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Abstraction"
+				      id="composite.tool.abstraction"
+				      kind="tool"
+				      label="Abstraction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Usage"
+				      id="composite.tool.usage"
+				      kind="tool"
+				      label="Usage"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Dependency"
+				      id="composite.tool.dependency"
+				      kind="tool"
+				      label="Dependency"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new representation for an InformationItem"
+				      id="composite.tool.representation"
+				      kind="tool"
+				      label="Representation"
+				      large_icon="icons/obj16/Representation.gif"
+				      path=""
+				      small_icon="icons/obj16/Representation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new InformationFlow"
+				      id="composite.tool.informationflow"
+				      kind="tool"
+				      label="InformationFlow"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
+
+<extension
+	id="Papyrus Composite Structure Diagram .standard"
+	name="Papyrus Composite Structure Diagram  Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Nodes"
+		      id="composite.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="composite.tool.class"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.property"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.port"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.collaboration"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.collaborationrole"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.collaborationuse"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.comment"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.constraint"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.timeobservation"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.durationobservation"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.informationitem"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.parameter"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.activity"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.interaction"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.protocolstatemachine"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.statemachine"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.functionbehavior"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.opaquebehavior"
+		        path="/composite.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Edges"
+		      id="composite.group.edges"
+		      kind="drawer"
+		      label="Edges"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="composite.tool.link"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.connector"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.rolebinding"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.generalization"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.realization"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.substitution"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.abstraction"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.usage"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.dependency"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.representation"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="composite.tool.informationflow"
+		        path="/composite.group.edges">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>
+	</paletteProvider>	
+		
+</extension>
 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
 		<diagramMappings diagramID="CompositeStructure">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index c8a6e3ef837..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.composite.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
index d26a89735b2..a3d89521010 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
@@ -91,820 +91,803 @@
       </creationCommand>
    </extension>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.deployment.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.deployment.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
    
-   <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.deployment.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.deployment.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

 
-   <extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.deployment.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.deployment.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
 
-   <extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.deployment.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.deployment.part.LoadResourceAction"/>

-   </extension>

+   <extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.deployment.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.deployment.part.LoadResourceAction"/>
+   </extension>
 
-<extension

-			id="Papyrus Deployment Diagram .palettedefinition"

-			name="Papyrus Deployment Diagram  Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.deployment.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create a model"

-				      id="createModelCreationTool"

-				      kind="tool"

-				      label="Model"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a Package"

-				      id="deployment.tool.package"

-				      kind="tool"

-				      label="Package"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Node"

-				      id="deployment.tool.node"

-				      kind="tool"

-				      label="Node"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Device"

-				      id="deployment.tool.device"

-				      kind="tool"

-				      label="Device"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new ExecutionEnvironment"

-				      id="deployment.tool.executionEnvironment"

-				      kind="tool"

-				      label="Execution Environment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Artifact"

-				      id="deployment.tool.artifact"

-				      kind="tool"

-				      label="Artifact"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Comment"

-				      id="deployment.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Constraint"

-				      id="deployment.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Link (Comment / Constraint)"

-				      id="deployment.tool.link"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Dependency"

-				      id="deployment.tool.dependency"

-				      kind="tool"

-				      label="Dependency"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a dependency branch"

-				      id="deployment.tool.dependencybranch"

-				      kind="tool"

-				      label="DependencyBranch"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Generalization"

-				      id="deployment.tool.generalization"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Deployment"

-				      id="deployment.tool.deployment"

-				      kind="tool"

-				      label="Deployment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Manifestation"

-				      id="deployment.tool.manifestation"

-				      kind="tool"

-				      label="Manifestation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

+<extension
+			id="Papyrus Deployment Diagram .palettedefinition"
+			name="Papyrus Deployment Diagram  Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.deployment.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create a model"
+				      id="createModelCreationTool"
+				      kind="tool"
+				      label="Model"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a Package"
+				      id="deployment.tool.package"
+				      kind="tool"
+				      label="Package"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Node"
+				      id="deployment.tool.node"
+				      kind="tool"
+				      label="Node"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Node.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Device"
+				      id="deployment.tool.device"
+				      kind="tool"
+				      label="Device"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Device.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new ExecutionEnvironment"
+				      id="deployment.tool.executionEnvironment"
+				      kind="tool"
+				      label="Execution Environment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExecutionEnvironment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Artifact"
+				      id="deployment.tool.artifact"
+				      kind="tool"
+				      label="Artifact"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Artifact.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Comment"
+				      id="deployment.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Constraint"
+				      id="deployment.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Link (Comment / Constraint)"
+				      id="deployment.tool.link"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Dependency"
+				      id="deployment.tool.dependency"
+				      kind="tool"
+				      label="Dependency"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a dependency branch"
+				      id="deployment.tool.dependencybranch"
+				      kind="tool"
+				      label="DependencyBranch"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Generalization"
+				      id="deployment.tool.generalization"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Deployment"
+				      id="deployment.tool.deployment"
+				      kind="tool"
+				      label="Deployment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Deployment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Manifestation"
+				      id="deployment.tool.manifestation"
+				      kind="tool"
+				      label="Manifestation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
 
-<extension

-	id="Papyrus Deployment Diagram .standard"

-	name="Papyrus Deployment Diagram  Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.deployment.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Nodes"

-		      id="deployment.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createModelCreationTool"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.package"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.node"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.device"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.executionEnvironment"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.artifact"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.comment"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.constraint"

-		        path="/deployment.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Links"

-		      id="deployment.group.links"

-		      kind="drawer"

-		      label="Links"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="deployment.tool.link"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.dependency"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.dependencybranch"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.generalization"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.deployment"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="deployment.tool.manifestation"

-		        path="/deployment.group.links">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

+<extension
+	id="Papyrus Deployment Diagram .standard"
+	name="Papyrus Deployment Diagram  Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.deployment.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Nodes"
+		      id="deployment.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createModelCreationTool"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.package"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.node"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.device"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.executionEnvironment"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.artifact"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.comment"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.constraint"
+		        path="/deployment.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Links"
+		      id="deployment.group.links"
+		      kind="drawer"
+		      label="Links"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="deployment.tool.link"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.dependency"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.dependencybranch"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.generalization"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.deployment"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="deployment.tool.manifestation"
+		        path="/deployment.group.links">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.deployment"/>
+	</paletteProvider>	
+		
+</extension>
 
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"

-      name="PapyrusUMLDeploymentDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"

-      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"

-      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"
+      name="PapyrusUMLDeploymentDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"
+      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLDeploymentDiagram"
+      class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
 
 
-<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.deployment"

-            labelProvider="org.eclipse.papyrus.uml.diagram.deployment.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.deployment"
+            labelProvider="org.eclipse.papyrus.uml.diagram.deployment.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
 
-<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.deployment">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.deployment">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
 
-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.deployment">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.deployment.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-      </propertySections>

-   </extension>

+<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.deployment">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.deployment.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+      </propertySections>
+   </extension>
 
-<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.deployment.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLDeploymentDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2010,2009,2005,2001,2002,2003,2006,2008,2012,49,36,16,44,21,46,23,42,25,28,40,54,56"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4005,4008,4009,4001,4002,4003,4004,4010"/>

-      </viewProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLDeploymentDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2010,2009,2005,2001,2002,2003,2006,2008,2012,49,36,16,44,21,46,23,42,25,28,40,54,56"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4005,4008,4009,4001,4002,4003,4004,4010"/>
+      </viewProvider>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="true"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLDeploymentDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="2011,2010,2009,2005,2001,2002,2003,2006,2008,2012,49,36,16,44,21,46,23,42,25,28,40,54,56"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="4005,4008,4009,4001,4002,4003,4004,4010"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="7,48,35,2,3,1,5,6,8,9,53,50,37,20,45,22,47,24,43,27,29,41,55,57,58"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="51,38,17,18,19,26,52,39,30,31,32,33,34"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLDeploymentDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="2011,2010,2009,2005,2001,2002,2003,2006,2008,2012,49,36,16,44,21,46,23,42,25,28,40,54,56"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="4005,4008,4009,4001,4002,4003,4004,4010"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="7,48,35,2,3,1,5,6,8,9,53,50,37,20,45,22,47,24,43,27,29,41,55,57,58"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="51,38,17,18,19,26,52,39,30,31,32,33,34"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
    
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

-
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Dependency_2011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="2011"/>

-         </metamodelType>

-      </metamodel>

-         <specializationType

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

-               name="%metatype.name.Model_2010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="2010"/>

-         </specializationType>

-         <specializationType

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

-               name="%metatype.name.Package_2009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="2009"/>

-         </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_2005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="2005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_2001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="2001"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ExecutionEnvironment_2002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ExecutionEnvironment"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ExecutionEnvironmentEditHelper">

-            <param name="semanticHint" value="2002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Device_2003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Device"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DeviceEditHelper">

-            <param name="semanticHint" value="2003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Artifact_2006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Artifact"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ArtifactEditHelper">

-            <param name="semanticHint" value="2006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Node_2008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Node"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.NodeEditHelper">

-            <param name="semanticHint" value="2008"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.NamedElement_2012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="NamedElement"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DefaultNamedElementEditHelper">

-            <param name="semanticHint" value="2012"/>

-         </metamodelType>

-      </metamodel>

-         <specializationType

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

-               name="%metatype.name.Model_49"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="49"/>

-         </specializationType>

-         <specializationType

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

-               name="%metatype.name.Package_36"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="36"/>

-         </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Device_16"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>

-            <param name="semanticHint" value="16"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Device_44"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>

-            <param name="semanticHint" value="44"/>

-         </specializationType>

-      </metamodel>

-         <specializationType

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

-               name="%metatype.name.ExecutionEnvironment_21"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="21"/>

-         </specializationType>

-         <specializationType

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

-               name="%metatype.name.ExecutionEnvironment_46"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="46"/>

-         </specializationType>

-         <specializationType

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

-               name="%metatype.name.Node_23"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="23"/>

-         </specializationType>

-         <specializationType

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

-               name="%metatype.name.Node_42"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="42"/>

-         </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Artifact_25"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>

-            <param name="semanticHint" value="25"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Artifact_28"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>

-            <param name="semanticHint" value="28"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Artifact_40"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>

-            <param name="semanticHint" value="40"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_54"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="54"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_56"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="56"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

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

-            name="%metatype.name.Link_4005"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="4005"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_4008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_4009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Deployment_4001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Deployment"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DeploymentEditHelper">

-            <param name="semanticHint" value="4001"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Manifestation_4002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Manifestation"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ManifestationEditHelper">

-            <param name="semanticHint" value="4002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_4003"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4003"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4004"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>

-            <param name="semanticHint" value="4004"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>

-            <param name="semanticHint" value="4010"/>

-         </specializationType>

-      </metamodel>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.deployment.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.deployment.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Model_2010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_2009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Constraint_2005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Comment_2001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_2002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_2008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.NamedElement_2012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Model_49"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_36"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_16"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_44"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_21"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_46"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_23"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_42"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_25"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_28"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_40"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Comment_54"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Constraint_56"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Link_4005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.CommentAnnotatedElement_4006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ConstraintConstrainedElement_4007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Deployment_4001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Manifestation_4002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Generalization_4003"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4010"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"
+               name="%metatype.name.Dependency_2011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="2011"/>
+         </metamodelType>
+      </metamodel>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Model_2010"
+               name="%metatype.name.Model_2010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="2010"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Package_2009"
+               name="%metatype.name.Package_2009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="2009"/>
+         </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Constraint_2005"
+               name="%metatype.name.Constraint_2005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="2005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Comment_2001"
+               name="%metatype.name.Comment_2001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="2001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_2002"
+               name="%metatype.name.ExecutionEnvironment_2002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ExecutionEnvironment"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ExecutionEnvironmentEditHelper">
+            <param name="semanticHint" value="2002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"
+               name="%metatype.name.Device_2003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Device"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DeviceEditHelper">
+            <param name="semanticHint" value="2003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"
+               name="%metatype.name.Artifact_2006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Artifact"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ArtifactEditHelper">
+            <param name="semanticHint" value="2006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Node_2008"
+               name="%metatype.name.Node_2008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Node"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.NodeEditHelper">
+            <param name="semanticHint" value="2008"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.NamedElement_2012"
+               name="%metatype.name.NamedElement_2012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="NamedElement"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DefaultNamedElementEditHelper">
+            <param name="semanticHint" value="2012"/>
+         </metamodelType>
+      </metamodel>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Model_49"
+               name="%metatype.name.Model_49"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="49"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Package_36"
+               name="%metatype.name.Package_36"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="36"/>
+         </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Device_16"
+               name="%metatype.name.Device_16"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>
+            <param name="semanticHint" value="16"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Device_44"
+               name="%metatype.name.Device_44"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>
+            <param name="semanticHint" value="44"/>
+         </specializationType>
+      </metamodel>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_21"
+               name="%metatype.name.ExecutionEnvironment_21"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="21"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_46"
+               name="%metatype.name.ExecutionEnvironment_46"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="46"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Node_23"
+               name="%metatype.name.Node_23"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="23"/>
+         </specializationType>
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Node_42"
+               name="%metatype.name.Node_42"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="42"/>
+         </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_25"
+               name="%metatype.name.Artifact_25"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>
+            <param name="semanticHint" value="25"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_28"
+               name="%metatype.name.Artifact_28"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>
+            <param name="semanticHint" value="28"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_40"
+               name="%metatype.name.Artifact_40"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>
+            <param name="semanticHint" value="40"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Comment_54"
+               name="%metatype.name.Comment_54"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="54"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Constraint_56"
+               name="%metatype.name.Constraint_56"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="56"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.deployment.Link_4005"
+            name="%metatype.name.Link_4005"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="4005"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.CommentAnnotatedElement_4006"
+               name="%metatype.name.CommentAnnotatedElement_4008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.ConstraintConstrainedElement_4007"
+               name="%metatype.name.ConstraintConstrainedElement_4009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Deployment_4001"
+               name="%metatype.name.Deployment_4001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Deployment"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.DeploymentEditHelper">
+            <param name="semanticHint" value="4001"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Manifestation_4002"
+               name="%metatype.name.Manifestation_4002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Manifestation"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.ManifestationEditHelper">
+            <param name="semanticHint" value="4002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Generalization_4003"
+               name="%metatype.name.Generalization_4003"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.deployment.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4003"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4004"
+               name="%metatype.name.Dependency_4004"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>
+            <param name="semanticHint" value="4004"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4010"
+               name="%metatype.name.Dependency_4010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>
+            <param name="semanticHint" value="4010"/>
+         </specializationType>
+      </metamodel>
+   </extension>
 
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.deployment.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.deployment.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.deployment.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Model_2010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_2009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Constraint_2005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Comment_2001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_2002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_2003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_2008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.NamedElement_2012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Model_49"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Package_36"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_16"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Device_44"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_21"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_46"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_23"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Node_42"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_25"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_28"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Artifact_40"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Comment_54"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Constraint_56"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Link_4005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.CommentAnnotatedElement_4006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.ConstraintConstrainedElement_4007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Deployment_4001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Manifestation_4002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Generalization_4003"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4010"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.deployment.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

 
-<extension id="diagnostic" name="Papyrus Deployment Diagram  problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.deployment.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+<extension id="diagnostic" name="Papyrus Deployment Diagram  problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.deployment.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
 		<diagramMappings diagramID="PapyrusUMLDeploymentDiagram">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 0e879dafc42..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.deployment.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
index d64b976160b..94b3db43215 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
@@ -1,1438 +1,1421 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2010, 2014 CEA and others.

- 

- All rights reserved. This program and the accompanying materials

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

- which accompanies this distribution, and is available at

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

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-

-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

-   

-

-

-

-	<?gmfgen generated="true"?>

-	<extension

-			id="PapyrusUMLProfileDiagram.palettedefinition"

-			name="PapyrusUMLProfileDiagram Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create a new Class"

-				      id="createClass6CreationTool"

-				      kind="tool"

-				      label="Class"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new comment"

-				      id="createComment2CreationTool"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a constraint"

-				      id="createConstraint3CreationTool"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new DataType"

-				      id="createDataType4CreationTool"

-				      kind="tool"

-				      label="DataType"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new Enumeration"

-				      id="createEnumeration5CreationTool"

-				      kind="tool"

-				      label="Enumeration"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add new EnumerationLiteral"

-				      id="createEnumerationLiteral6CreationTool"

-				      kind="tool"

-				      label="EnumerationLiteral"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Import a new Metaclass"

-				      id="createImportMetaclass7CreationTool"

-				      kind="tool"

-				      label="Import Metaclass"

-				      large_icon="/icons/Metaclass.gif"

-				      path=""

-				      small_icon="/icons/Metaclass.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add new operation"

-				      id="createOperation8CreationTool"

-				      kind="tool"

-				      label="Operation"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a new Package"

-				      id="createPackage9CreationTool"

-				      kind="tool"

-				      label="Package"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add a new Profile"

-				      id="createProfile10CreationTool"

-				      kind="tool"

-				      label="Profile"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create new PrimitiveType"

-				      id="createPrimitiveType11CreationTool"

-				      kind="tool"

-				      label="PrimitiveType"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add new property"

-				      id="createProperty12CreationTool"

-				      kind="tool"

-				      label="Property"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add new Stereotype"

-				      id="createStereotype13CreationTool"

-				      kind="tool"

-				      label="Stereotype"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create an Association"

-				      id="createAssociation1CreationTool"

-				      kind="tool"

-				      label="Association"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a context link for a Constraint"

-				      id="createContextLink6CreationTool"

-				      kind="tool"

-				      label="ContextLink"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Add an Extension"

-				      id="createExtension3CreationTool"

-				      kind="tool"

-				      label="Extension"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a generalization"

-				      id="createGeneralization4CreationTool"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a link for Comment, Constraint"

-				      id="createLink5CreationTool"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create a ProfileApplication"

-				      id="createProfileApplication6CreationTool"

-				      kind="tool"

-				      label="ProfileApplication"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

-

-	<?gmfgen generated="true"?>

-	<extension

-	id="PapyrusUMLProfileDiagram.standard"

-	name="PapyrusUMLProfileDiagram Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Nodes"

-		      id="createNodes1Group"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createClass6CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createComment2CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createConstraint3CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createDataType4CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createEnumeration5CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createEnumerationLiteral6CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createImportMetaclass7CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createOperation8CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createPackage9CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createProfile10CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createPrimitiveType11CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createProperty12CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createStereotype13CreationTool"

-		        path="/createNodes1Group">

-		  </predefinedEntry>

-		<entry

-		      description="Edges"

-		      id="createEdges2Group"

-		      kind="drawer"

-		      label="Edges"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createAssociation1CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createContextLink6CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createExtension3CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createGeneralization4CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createLink5CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createProfileApplication6CreationTool"

-		        path="/createEdges2Group">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

-

-

-

-<?gmfgen generated="true"?>

-

-	<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer"/>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLProfileDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/>

-      </viewProvider>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="true"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLProfileDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="1,1034,5029,1084,3,1015,5063,5020,1047,5026,5023,5032,5035,2,5058,1046,5014,5062,1008,1056,1050,1010,1059,5064,5055,5061"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070,7017,7011,7018,7012"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

-   <extension

-         id="ep-provider"

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

-      <editpartProvider

-            class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomUMLEditPartProvider">

-         <Priority

-               name="Highest">

-         </Priority>

-         <object

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

-               id="generated-diagram">

-            <method

-                  name="getType()"

-                  value="PapyrusUMLProfileDiagram">

-            </method>

-         </object>

-         <object

-               class="org.eclipse.gmf.runtime.notation.Node"

-               id="generated-nodes">

-            <method

-                  name="getType()"

-                  value="2014,2015,1026,1031,1002,1014,2005,1030,2007,2006,2010,2016,3019,1037,3018,3002,3020,1023,3028,1007,1027,1024,1012,1028,3025,3027">

-            </method>

-         </object>

-         <object

-               class="org.eclipse.gmf.runtime.notation.Edge"

-               id="generated-links">

-            <method

-                  name="getType()"

-                  value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014">

-            </method>

-         </object>

-         <object

-               class="org.eclipse.gmf.runtime.notation.Node"

-               id="generated-labels">

-            <method

-                  name="getType()"

-                  value="1,1034,1084,3,1015,5020,1047,5026,5023,5035,2,1046,5062,1008,1056,1050,1010,1059,5055,5061">

-            </method>

-         </object>

-         <object

-               class="org.eclipse.gmf.runtime.notation.Node"

-               id="generated-compartments">

-            <method

-                  name="getType()"

-                  value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070">

-            </method>

-         </object>

-         <context

-               views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">

-         </context>

-      </editpartProvider>

-   </extension>

-

-   

-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLIconProvider">

-         <Priority name="Lowest"/>

-      </IconProvider>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Profile_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Profile"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileDiagramEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Dependency_2014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="2014"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Association_2015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Association"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.AssociationEditHelper">

-            <param name="semanticHint" value="2015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Stereotype_1026"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Stereotype"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">

-            <param name="semanticHint" value="1026"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Class_2008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Class"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassEditHelper">

-            <param name="semanticHint" value="2008"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_1031"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>

-            <param name="semanticHint" value="1031"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_1002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="1002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_1014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="1014"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Model_2005"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Model"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ModelEditHelper">

-            <param name="semanticHint" value="2005"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Profile_1030"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Profile"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileEditHelper">

-            <param name="semanticHint" value="1030"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_2007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="2007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Enumeration_2006"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Enumeration"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationEditHelper">

-            <param name="semanticHint" value="2006"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.PrimitiveType_2009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>

-            <param name="semanticHint" value="2009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.DataType_2010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DataType"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeEditHelper">

-            <param name="semanticHint" value="2010"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-         <metamodelType

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

-               name="%metatype.name.Diagram_2016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Diagram"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ShortCutDiagramEditHelper">

-            <param name="semanticHint" value="2016"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PrimitiveType_3026"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PrimitiveType"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PrimitiveTypeEditHelper">

-            <param name="semanticHint" value="3026"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Operation_3019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Operation"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeOperationEditHelper">

-            <param name="semanticHint" value="3019"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.EnumerationLiteral_1037"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="EnumerationLiteral"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationLiteralEditHelper">

-            <param name="semanticHint" value="1037"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Property_3018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypePropertyEditHelper">

-            <param name="semanticHint" value="3018"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Property_3002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Property"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassPropertyEditHelper">

-            <param name="semanticHint" value="3002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Operation_3020"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Operation"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassOperationEditHelper">

-            <param name="semanticHint" value="3020"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Stereotype_1023"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Stereotype"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">

-            <param name="semanticHint" value="1023"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Class_3010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Class_2008"/>

-            <param name="semanticHint" value="3010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Class_3028"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Class"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.MetaclassEditHelper">

-            <param name="semanticHint" value="3028"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_1007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelperCN">

-            <param name="semanticHint" value="1007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Model_1027"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>

-            <param name="semanticHint" value="1027"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Profile_1024"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>

-            <param name="semanticHint" value="1024"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelperCN">

-            <param name="semanticHint" value="1012"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_1028"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelperCN">

-            <param name="semanticHint" value="1028"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Enumeration_3025"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>

-            <param name="semanticHint" value="3025"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.DataType_3027"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>

-            <param name="semanticHint" value="3027"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Extension_1013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Extension"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ExtensionEditHelper">

-            <param name="semanticHint" value="1013"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Association_4001"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>

-            <param name="semanticHint" value="4001"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ProfileApplication_1045"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ProfileApplication"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileApplicationEditHelper">

-            <param name="semanticHint" value="1045"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Association_4019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>

-            <param name="semanticHint" value="4019"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_4002"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4002"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>

-            <param name="semanticHint" value="4008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Dependency_4018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>

-            <param name="semanticHint" value="4018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ElementImport_1064"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ElementImport"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ElementImportEditHelper">

-            <param name="semanticHint" value="1064"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PackageImport_1065"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PackageImport"

-               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageImportEditHelper">

-            <param name="semanticHint" value="1065"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_1022"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="1022"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_4014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintContext_8500"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8500"/>

-         </specializationType>

-      </metamodel>

-   </extension>

-

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

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.profile.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.profile.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Class_2008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Package_1004"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Class_3010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_1027"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Extension_1013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4001"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

-   <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

-   

-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.profile.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

-

-

-   <extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

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

-      <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

-            factoryClass="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramEditorFactory"

-            icon="icons/obj16/Diagram_Profile.gif">

-      </editorDiagram>

-      <creationCommand

-            creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"

-            creationCondition="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramCreationCondition"

-            icon="icons/obj16/Diagram_Profile.gif"

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

-            language="profile"

-            label="UML Profile Diagram">

-      </creationCommand>

-   </extension>

-<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.profile"

-            labelProvider="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

-

-<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.profile">

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

-

-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.profile">

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-         </propertySection>

-      </propertySections>

-   </extension>

-

-<extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.LoadResourceAction"/>

-   </extension>

-

-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

-<extension

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

-   <service

-         classname="org.eclipse.papyrus.uml.diagram.profile.service.ProfileService"

-         priority="1"

-         startKind="startup"

-         useClassTypeAsKey="true">

-   </service>

-</extension>

-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"

-      name="PapyrusUMLProfileDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"

-      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"

-      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

-

-<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

-      <?gmfgen generated="true"?>

-      <propertyTester

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

-            type="org.eclipse.emf.common.ui.URIEditorInput"

-            namespace="org.eclipse.papyrus.uml.diagram.profile"

-            properties="isURIEditorInput"

-            class="org.eclipse.papyrus.uml.diagram.profile.part.UMLUriEditorInputTester">

-      </propertyTester>

-   </extension>

-

-<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

-      <?gmfgen generated="true"?>

-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.resourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.domainResourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorLinkHelper"/>

-         </includes>

-      </viewerContentBinding>

-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorActionProvider"/>

-         </includes>

-      </viewerActionBinding>

-   </extension>

-

-<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

-      <?gmfgen generated="true"?>

-      <navigatorContent

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

-            name="%navigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </possibleChildren>

-         <commonSorter 

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

-               class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorSorter">

-            <parentExpression>

-               <or>

-                  <and>

-                     <instanceof value="org.eclipse.core.resources.IFile"/>

-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>

-                  </and>

-                  <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-               </or>

-            </parentExpression>

-         </commonSorter>

-      </navigatorContent>

-      <navigatorContent

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

-            name="%domainNavigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>

-         </possibleChildren>

-      </navigatorContent>

-      <actionProvider

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

-            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorActionProvider">

-         <enablement>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </enablement>

-      </actionProvider>

-   </extension>

-

-<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

-      <?gmfgen generated="true"?>

-      <linkHelper

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

-            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLinkHelper">

-         <editorInputEnablement>

-            <and>

-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

-               <test property="org.eclipse.papyrus.uml.diagram.profile.isURIEditorInput"/>

-            </and>

-         </editorInputEnablement>

-         <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>

-         </selectionEnablement>

-      </linkHelper>

-   </extension>

-<extension

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

-   <command

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

-         description="Create a New UML2 Profile Diagram"

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

-         name="New PapyII Profile Diagram( Papyrus II)">

-   </command>

-</extension>

-

-<extension

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

-	<diagramCategory

-       class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand"

-       description="Profile diagram"

-       extensionPrefix="profile"

-       icon="icons/wizban/category_profile.gif"

-       id="profile"

-       label="Profile">

-	</diagramCategory>      

-</extension>

-

-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.profile.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

-

-<extension id="diagnostic" name="PapyrusUMLProfileDiagram problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

-

-

-

-

-

-

-

-

-

-

-

-   <!-- optionally, specify keybindings -->

-   <extension

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

-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomNamespaceEditPolicyProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

-   </editpolicyProvider>

-</extension>

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

-		<diagramMappings diagramID="PapyrusUMLProfileDiagram">

-			<mapping type="PapyrusUMLProfileDiagram" humanReadableType="ProfileDiagram"/>

-			

-	<mapping

-		humanReadableType="packaged elements"

-		type="1005">

-	</mapping>

-

-	<mapping

-		humanReadableType="packaged elements"

-		type="11">

-	</mapping>

-

-	<mapping

-		humanReadableType="packaged elements"

-		type="1042">

-	</mapping>

-

-	<mapping

-		humanReadableType="packaged elements"

-		type="1051">

-	</mapping>

-

-	<mapping

-		humanReadableType="attributes"

-		type="1071">

-	</mapping>

-

-	<mapping

-		humanReadableType="attributes"

-		type="1052">

-	</mapping>

-

-	<mapping

-		humanReadableType="operations"

-		type="1019">

-	</mapping>

-

-	<mapping

-		humanReadableType="operations"

-		type="1053">

-	</mapping>

-

-	<mapping

-		humanReadableType="packaged elements"

-		type="1057">

-	</mapping>

-

-	<mapping

-		humanReadableType="packaged elements"

-		type="1058">

-	</mapping>

-

-	<mapping

-		humanReadableType="literals"

-		type="1062">

-	</mapping>

-

-	<mapping

-		humanReadableType="literals"

-		type="1063">

-	</mapping>

-

-	<mapping

-		humanReadableType="attributes"

-		type="1067">

-	</mapping>

-

-	<mapping

-		humanReadableType="attributes"

-		type="1069">

-	</mapping>

-

-	<mapping

-		humanReadableType="operations"

-		type="1068">

-	</mapping>

-

-	<mapping

-		humanReadableType="operations"

-		type="1070">

-	</mapping>

-

-			

-	

-

-	

-	<mapping

-		humanReadableType="Stereotype"

-		type="6001">

-	</mapping>

-

-	<mapping

-		humanReadableType="Name"

-		type="6002">

-	</mapping>

-

-	<mapping

-		humanReadableType="TargetRole"

-		type="6003">

-	</mapping>

-

-	<mapping

-		humanReadableType="SourceRole"

-		type="6005">

-	</mapping>

-

-	<mapping

-		humanReadableType="SourceMultiplicity"

-		type="6033">

-	</mapping>

-

-	<mapping

-		humanReadableType="TargetMultiplicity"

-		type="6034">

-	</mapping>

-

-

-	

-

-	

-

-	

-	<mapping

-		humanReadableType="Stereotype"

-		type="6007">

-	</mapping>

-

-

-	

-	<mapping

-		humanReadableType="Name"

-		type="6026">

-	</mapping>

-

-	<mapping

-		humanReadableType="Stereotype"

-		type="6027">

-	</mapping>

-

-

-	

-

-	

-	<mapping

-		humanReadableType="Alias"

-		type="6020">

-	</mapping>

-

-	<mapping

-		humanReadableType="Stereotype"

-		type="6021">

-	</mapping>

-

-

-	

-	<mapping

-		humanReadableType="Stereotype"

-		type="6022">

-	</mapping>

-

-

-	

-

-	

-

-	

-

-		</diagramMappings>

-	</extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2010, 2014 CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+
+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
+   
+
+
+
+	<?gmfgen generated="true"?>
+	<extension
+			id="PapyrusUMLProfileDiagram.palettedefinition"
+			name="PapyrusUMLProfileDiagram Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create a new Class"
+				      id="createClass6CreationTool"
+				      kind="tool"
+				      label="Class"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new comment"
+				      id="createComment2CreationTool"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a constraint"
+				      id="createConstraint3CreationTool"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new DataType"
+				      id="createDataType4CreationTool"
+				      kind="tool"
+				      label="DataType"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new Enumeration"
+				      id="createEnumeration5CreationTool"
+				      kind="tool"
+				      label="Enumeration"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add new EnumerationLiteral"
+				      id="createEnumerationLiteral6CreationTool"
+				      kind="tool"
+				      label="EnumerationLiteral"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Import a new Metaclass"
+				      id="createImportMetaclass7CreationTool"
+				      kind="tool"
+				      label="Import Metaclass"
+				      large_icon="/icons/Metaclass.gif"
+				      path=""
+				      small_icon="/icons/Metaclass.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add new operation"
+				      id="createOperation8CreationTool"
+				      kind="tool"
+				      label="Operation"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a new Package"
+				      id="createPackage9CreationTool"
+				      kind="tool"
+				      label="Package"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add a new Profile"
+				      id="createProfile10CreationTool"
+				      kind="tool"
+				      label="Profile"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Profile.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create new PrimitiveType"
+				      id="createPrimitiveType11CreationTool"
+				      kind="tool"
+				      label="PrimitiveType"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add new property"
+				      id="createProperty12CreationTool"
+				      kind="tool"
+				      label="Property"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add new Stereotype"
+				      id="createStereotype13CreationTool"
+				      kind="tool"
+				      label="Stereotype"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create an Association"
+				      id="createAssociation1CreationTool"
+				      kind="tool"
+				      label="Association"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a context link for a Constraint"
+				      id="createContextLink6CreationTool"
+				      kind="tool"
+				      label="ContextLink"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Add an Extension"
+				      id="createExtension3CreationTool"
+				      kind="tool"
+				      label="Extension"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extension.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a generalization"
+				      id="createGeneralization4CreationTool"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a link for Comment, Constraint"
+				      id="createLink5CreationTool"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create a ProfileApplication"
+				      id="createProfileApplication6CreationTool"
+				      kind="tool"
+				      label="ProfileApplication"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProfileApplication.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
+
+	<?gmfgen generated="true"?>
+	<extension
+	id="PapyrusUMLProfileDiagram.standard"
+	name="PapyrusUMLProfileDiagram Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.profile.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Nodes"
+		      id="createNodes1Group"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createClass6CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createComment2CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createConstraint3CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createDataType4CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createEnumeration5CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createEnumerationLiteral6CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createImportMetaclass7CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createOperation8CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createPackage9CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createProfile10CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createPrimitiveType11CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createProperty12CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createStereotype13CreationTool"
+		        path="/createNodes1Group">
+		  </predefinedEntry>
+		<entry
+		      description="Edges"
+		      id="createEdges2Group"
+		      kind="drawer"
+		      label="Edges"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createAssociation1CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createContextLink6CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createExtension3CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createGeneralization4CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createLink5CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createProfileApplication6CreationTool"
+		        path="/createEdges2Group">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.profile"/>
+	</paletteProvider>	
+		
+</extension>
+
+
+
+<?gmfgen generated="true"?>
+
+	<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer"/>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLProfileDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/>
+      </viewProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLProfileDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="2014,2015,1026,2008,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3010,3028,1007,1027,1024,1012,1028,3025,3027"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014,8500"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="1,1034,5029,1084,3,1015,5063,5020,1047,5026,5023,5032,5035,2,5058,1046,5014,5062,1008,1056,1050,1010,1059,5064,5055,5061"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070,7017,7011,7018,7012"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
+   <extension
+         id="ep-provider"
+         point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+      <editpartProvider
+            class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomUMLEditPartProvider">
+         <Priority
+               name="Highest">
+         </Priority>
+         <object
+               class="org.eclipse.gmf.runtime.notation.Diagram"
+               id="generated-diagram">
+            <method
+                  name="getType()"
+                  value="PapyrusUMLProfileDiagram">
+            </method>
+         </object>
+         <object
+               class="org.eclipse.gmf.runtime.notation.Node"
+               id="generated-nodes">
+            <method
+                  name="getType()"
+                  value="2014,2015,1026,1031,1002,1014,2005,1030,2007,2006,2010,2016,3019,1037,3018,3002,3020,1023,3028,1007,1027,1024,1012,1028,3025,3027">
+            </method>
+         </object>
+         <object
+               class="org.eclipse.gmf.runtime.notation.Edge"
+               id="generated-links">
+            <method
+                  name="getType()"
+                  value="1013,4001,1045,4019,4002,4008,4018,1064,1065,1022,4014">
+            </method>
+         </object>
+         <object
+               class="org.eclipse.gmf.runtime.notation.Node"
+               id="generated-labels">
+            <method
+                  name="getType()"
+                  value="1,1034,1084,3,1015,5020,1047,5026,5023,5035,2,1046,5062,1008,1056,1050,1010,1059,5055,5061">
+            </method>
+         </object>
+         <object
+               class="org.eclipse.gmf.runtime.notation.Node"
+               id="generated-compartments">
+            <method
+                  name="getType()"
+                  value="1005,11,1042,1051,1071,1052,1019,1053,1057,1058,1062,1063,1067,1069,1068,1070">
+            </method>
+         </object>
+         <context
+               views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
+         </context>
+      </editpartProvider>
+   </extension>
+
+   
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLIconProvider">
+         <Priority name="Lowest"/>
+      </IconProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"
+               name="%metatype.name.Profile_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Profile"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileDiagramEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"
+               name="%metatype.name.Dependency_2014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="2014"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"
+               name="%metatype.name.Association_2015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Association"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.AssociationEditHelper">
+            <param name="semanticHint" value="2015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"
+               name="%metatype.name.Stereotype_1026"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Stereotype"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">
+            <param name="semanticHint" value="1026"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Class_2008"
+               name="%metatype.name.Class_2008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Class"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassEditHelper">
+            <param name="semanticHint" value="2008"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"
+               name="%metatype.name.Class_1031"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>
+            <param name="semanticHint" value="1031"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"
+               name="%metatype.name.Comment_1002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="1002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"
+               name="%metatype.name.Constraint_1014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="1014"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Model_2005"
+               name="%metatype.name.Model_2005"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Model"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ModelEditHelper">
+            <param name="semanticHint" value="2005"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"
+               name="%metatype.name.Profile_1030"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Profile"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileEditHelper">
+            <param name="semanticHint" value="1030"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Package_1004"
+               name="%metatype.name.Package_2007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="2007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"
+               name="%metatype.name.Enumeration_2006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Enumeration"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationEditHelper">
+            <param name="semanticHint" value="2006"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"
+               name="%metatype.name.PrimitiveType_2009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>
+            <param name="semanticHint" value="2009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"
+               name="%metatype.name.DataType_2010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DataType"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeEditHelper">
+            <param name="semanticHint" value="2010"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"
+               name="%metatype.name.Diagram_2016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Diagram"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ShortCutDiagramEditHelper">
+            <param name="semanticHint" value="2016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"
+               name="%metatype.name.PrimitiveType_3026"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PrimitiveType"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PrimitiveTypeEditHelper">
+            <param name="semanticHint" value="3026"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"
+               name="%metatype.name.Operation_3019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Operation"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypeOperationEditHelper">
+            <param name="semanticHint" value="3019"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"
+               name="%metatype.name.EnumerationLiteral_1037"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="EnumerationLiteral"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.EnumerationLiteralEditHelper">
+            <param name="semanticHint" value="1037"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"
+               name="%metatype.name.Property_3018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.DataTypePropertyEditHelper">
+            <param name="semanticHint" value="3018"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"
+               name="%metatype.name.Property_3002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassPropertyEditHelper">
+            <param name="semanticHint" value="3002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"
+               name="%metatype.name.Operation_3020"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Operation"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ClassOperationEditHelper">
+            <param name="semanticHint" value="3020"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"
+               name="%metatype.name.Stereotype_1023"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Stereotype"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.StereotypeEditHelper">
+            <param name="semanticHint" value="1023"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Class_3010"
+               name="%metatype.name.Class_3010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Class_2008"/>
+            <param name="semanticHint" value="3010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"
+               name="%metatype.name.Class_3028"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Class"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.MetaclassEditHelper">
+            <param name="semanticHint" value="3028"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"
+               name="%metatype.name.Comment_1007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.CommentEditHelperCN">
+            <param name="semanticHint" value="1007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Model_1027"
+               name="%metatype.name.Model_1027"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>
+            <param name="semanticHint" value="1027"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"
+               name="%metatype.name.Profile_1024"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>
+            <param name="semanticHint" value="1024"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"
+               name="%metatype.name.Package_1012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageEditHelperCN">
+            <param name="semanticHint" value="1012"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"
+               name="%metatype.name.Constraint_1028"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ConstraintEditHelperCN">
+            <param name="semanticHint" value="1028"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"
+               name="%metatype.name.Enumeration_3025"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>
+            <param name="semanticHint" value="3025"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"
+               name="%metatype.name.DataType_3027"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>
+            <param name="semanticHint" value="3027"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Extension_1013"
+               name="%metatype.name.Extension_1013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Extension"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ExtensionEditHelper">
+            <param name="semanticHint" value="1013"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Association_4001"
+               name="%metatype.name.Association_4001"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
+            <param name="semanticHint" value="4001"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"
+               name="%metatype.name.ProfileApplication_1045"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ProfileApplication"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ProfileApplicationEditHelper">
+            <param name="semanticHint" value="1045"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Association_4019"
+               name="%metatype.name.Association_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
+            <param name="semanticHint" value="4019"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"
+               name="%metatype.name.Generalization_4002"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4002"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"
+               name="%metatype.name.Dependency_4008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
+            <param name="semanticHint" value="4008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"
+               name="%metatype.name.Dependency_4018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
+            <param name="semanticHint" value="4018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"
+               name="%metatype.name.ElementImport_1064"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ElementImport"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.ElementImportEditHelper">
+            <param name="semanticHint" value="1064"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"
+               name="%metatype.name.PackageImport_1065"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PackageImport"
+               edithelper="org.eclipse.papyrus.uml.diagram.profile.edit.helpers.PackageImportEditHelper">
+            <param name="semanticHint" value="1065"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"
+               name="%metatype.name.CommentAnnotatedElement_1022"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="1022"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"
+               name="%metatype.name.ConstraintConstrainedElement_4014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500"
+               name="%metatype.name.ConstraintContext_8500"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8500"/>
+         </specializationType>
+      </metamodel>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.profile.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.profile.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.profile.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Class_2008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Package_1004"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Class_3010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_1027"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Extension_1013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4001"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
+   
+
+
+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+      <editorDiagram
+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
+            factoryClass="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramEditorFactory"
+            icon="icons/obj16/Diagram_Profile.gif">
+      </editorDiagram>
+      <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
+            creationCondition="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramCreationCondition"
+            icon="icons/obj16/Diagram_Profile.gif"
+            id="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
+            language="profile"
+            label="UML Profile Diagram">
+      </creationCommand>
+   </extension>
+<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.profile"
+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+
+<extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.profile">
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+
+<extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.profile">
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+            <input type="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+         </propertySection>
+      </propertySections>
+   </extension>
+
+<extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.LoadResourceAction"/>
+   </extension>
+
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
+<extension
+      point="org.eclipse.papyrus.infra.core.service">
+   <service
+         classname="org.eclipse.papyrus.uml.diagram.profile.service.ProfileService"
+         priority="1"
+         startKind="startup"
+         useClassTypeAsKey="true">
+   </service>
+</extension>
+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
+      name="PapyrusUMLProfileDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
+      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
+      class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
+
+<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+      <propertyTester
+            id="org.eclipse.papyrus.uml.diagram.profile.URIEditorInputPropertyTester"
+            type="org.eclipse.emf.common.ui.URIEditorInput"
+            namespace="org.eclipse.papyrus.uml.diagram.profile"
+            properties="isURIEditorInput"
+            class="org.eclipse.papyrus.uml.diagram.profile.part.UMLUriEditorInputTester">
+      </propertyTester>
+   </extension>
+
+<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.resourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.domainResourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
+
+<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.profile.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="org.eclipse.papyrus.uml.diagram.profile.navigatorSorter" 
+               class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorSorter">
+            <parentExpression>
+               <or>
+                  <and>
+                     <instanceof value="org.eclipse.core.resources.IFile"/>
+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile_diagram"/>
+                  </and>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.profile.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLProfile"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="org.eclipse.papyrus.uml.diagram.profile.navigatorActionProvider"
+            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
+
+<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="org.eclipse.papyrus.uml.diagram.profile.navigatorLinkHelper"
+            class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="org.eclipse.papyrus.uml.diagram.profile.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
+<extension
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Create a New UML2 Profile Diagram"
+         id="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
+         name="New PapyII Profile Diagram( Papyrus II)">
+   </command>
+</extension>
+
+<extension
+	point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+	<diagramCategory
+       class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand"
+       description="Profile diagram"
+       extensionPrefix="profile"
+       icon="icons/wizban/category_profile.gif"
+       id="profile"
+       label="Profile">
+	</diagramCategory>      
+</extension>
+
+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.profile.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+<extension id="diagnostic" name="PapyrusUMLProfileDiagram problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
+
+
+
+
+
+
+
+
+
+
+
+   <!-- optionally, specify keybindings -->
+   <extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+   <editpolicyProvider
+         class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomNamespaceEditPolicyProvider">
+      <Priority
+            name="Lowest">
+      </Priority>
+   </editpolicyProvider>
+</extension>
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+		<diagramMappings diagramID="PapyrusUMLProfileDiagram">
+			<mapping type="PapyrusUMLProfileDiagram" humanReadableType="ProfileDiagram"/>
+			
+	<mapping
+		humanReadableType="packaged elements"
+		type="1005">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="11">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="1042">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="1051">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="1071">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="1052">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="1019">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="1053">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="1057">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="1058">
+	</mapping>
+
+	<mapping
+		humanReadableType="literals"
+		type="1062">
+	</mapping>
+
+	<mapping
+		humanReadableType="literals"
+		type="1063">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="1067">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="1069">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="1068">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="1070">
+	</mapping>
+
+			
+	
+
+	
+	<mapping
+		humanReadableType="Stereotype"
+		type="6001">
+	</mapping>
+
+	<mapping
+		humanReadableType="Name"
+		type="6002">
+	</mapping>
+
+	<mapping
+		humanReadableType="TargetRole"
+		type="6003">
+	</mapping>
+
+	<mapping
+		humanReadableType="SourceRole"
+		type="6005">
+	</mapping>
+
+	<mapping
+		humanReadableType="SourceMultiplicity"
+		type="6033">
+	</mapping>
+
+	<mapping
+		humanReadableType="TargetMultiplicity"
+		type="6034">
+	</mapping>
+
+
+	
+
+	
+
+	
+	<mapping
+		humanReadableType="Stereotype"
+		type="6007">
+	</mapping>
+
+
+	
+	<mapping
+		humanReadableType="Name"
+		type="6026">
+	</mapping>
+
+	<mapping
+		humanReadableType="Stereotype"
+		type="6027">
+	</mapping>
+
+
+	
+
+	
+	<mapping
+		humanReadableType="Alias"
+		type="6020">
+	</mapping>
+
+	<mapping
+		humanReadableType="Stereotype"
+		type="6021">
+	</mapping>
+
+
+	
+	<mapping
+		humanReadableType="Stereotype"
+		type="6022">
+	</mapping>
+
+
+	
+
+	
+
+	
+
+		</diagramMappings>
+	</extension>
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index c0a0e2dd9bd..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.profile.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 89bf930df84..2df42fc461f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2009, 2014 CEA and others.

- 

- All rights reserved. This program and the accompanying materials

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

- which accompanies this distribution, and is available at

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

- 

- Contributors:

-   CEA - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-  <extension point="org.eclipse.papyrus.views.properties.context">

-     <context contextModel="model/prop/seq.ctx">

-     </context>

-  </extension>

-  <extension

-         point="org.eclipse.papyrus.views.properties.environment">

-      <environment

-            environmentModel="model/prop/Environment.xmi">

-      </environment>

-   </extension>

-   

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2009, 2014 CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   CEA - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+  <extension point="org.eclipse.papyrus.views.properties.context">
+     <context contextModel="model/prop/seq.ctx">
+     </context>
+  </extension>
+  <extension
+         point="org.eclipse.papyrus.views.properties.environment">
+      <environment
+            environmentModel="model/prop/Environment.xmi">
+      </environment>
+   </extension>
+   
    <extension point="org.eclipse.ui.contexts" id="ui-context">
       <?gmfgen generated="true"?>
       <context
@@ -34,39 +34,39 @@
          parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
       </context>
    </extension>
-   

-   <extension

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

-      <command

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

-            description="Create a new Sequence Diagram"

-            id="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"

-            name="Create a new Sequence Diagram">

-      </command>

-   </extension>

-   

-   

-   

-   <extension

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

-      <editorDiagram

-    	    actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

-            contextId="com.cea.papyrus.gmf.editor.context"

-            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramEditorFactory"

-            icon="icons/obj16/Diagram_Sequence.gif">

-      </editorDiagram>

-      <creationCommand

-            creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"

-            creationCondition="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramCreationCondition"

-            icon="icons/obj16/Diagram_Sequence.gif"

-            id="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"

-            label="UML Sequence Diagram"

-            language="uml">

-      </creationCommand>

-   </extension>

-	

-

-

+   
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a new Sequence Diagram"
+            id="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"
+            name="Create a new Sequence Diagram">
+      </command>
+   </extension>
+   
+   
+   
+   <extension
+         point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+      <editorDiagram
+    	    actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
+            contextId="com.cea.papyrus.gmf.editor.context"
+            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramEditorFactory"
+            icon="icons/obj16/Diagram_Sequence.gif">
+      </editorDiagram>
+      <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"
+            creationCondition="org.eclipse.papyrus.uml.diagram.sequence.SequenceDiagramCreationCondition"
+            icon="icons/obj16/Diagram_Sequence.gif"
+            id="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand"
+            label="UML Sequence Diagram"
+            language="uml">
+      </creationCommand>
+   </extension>
+	
+
+
 
    <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
       <?gmfgen generated="true"?>
@@ -130,14 +130,14 @@
          </propertySection>
       </propertySections>
    </extension>
-

-

-<?gmfgen generated="true"?>

-

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

-		<?gmfgen generated="true"?>

-		<initializer class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer"/>

-	</extension>

+
+
+<?gmfgen generated="true"?>
+
+	<extension point="org.eclipse.core.runtime.preferences">
+		<?gmfgen generated="true"?>
+		<initializer class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer"/>
+	</extension>
 
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
       <?gmfgen generated="true"?>
@@ -163,7 +163,7 @@
             <method name="getType()" value="4003,4004,4005,4006,4007,4008,4009,4010,4011,4012,8500"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5001,5003,5004,5007,5002,5008,5023,5009,5013,5010,5014,5011,5015,5005,5012,5006,5018,5019,5016,5017"/>

+            <method name="getType()" value="5001,5003,5004,5007,5002,5008,5023,5009,5013,5010,5014,5011,5015,5005,5012,5006,5018,5019,5016,5017"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
             <method name="getType()" value="7001,7004"/>
@@ -561,7 +561,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.ConstraintConstrainedElement_4011"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_4012"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.sequence.ConstraintContext_8500"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
          <advice ref="org.eclipse.papyrus.infra.emf.readOnlyAdvice"/>
       </binding>
    </extension>
@@ -678,24 +678,7 @@
          </selectionEnablement>
       </linkHelper>
    </extension>
-   <extension point="org.eclipse.ui.commands" id="update-cmd">
-      <?gmfgen generated="true"?>
-      <command
-         categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramUpdateCommand"
-         description="%update.diagram.description"
-         id="org.eclipse.papyrus.uml.diagram.sequence.updateDiagram"
-         name="%update.diagram.name"/>
-   </extension>
    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
-      <?gmfgen generated="true"?>
-      <key 
-         commandId="org.eclipse.papyrus.uml.diagram.sequence.updateDiagram"
-         contextId="org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext"
-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-         sequence="F5"/>
-   </extension>
 
    <extension point="org.eclipse.ui.menus" id="context-menus">
       <?gmfgen generated="true"?>
@@ -727,550 +710,550 @@
    </extension>
 
 
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-      <page

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-            name="PapyrusUMLSequenceDiagram Diagram"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramGeneralPreferencePage">

-      </page>

+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+      <page
+            id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
+            name="PapyrusUMLSequenceDiagram Diagram"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramGeneralPreferencePage">
+      </page>
       
 
 
-      <page

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"

-            name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">

-      </page>

+      <page
+            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"
+            name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">
+      </page>
+
+      <page
+            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage"
+            name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
+            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage">
+      </page>
+
+   </extension>
+
+<extension
+		id="UML Plugin.palettedefinition"
+		name="UML Plugin Predefined Entries"
+		point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+		
+		<?gmfgen generated="true"?>	
+		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+			<Priority name="Lowest"/>
+      		<contribution
+            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">
+     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+					<entry
+       defineOnly="true"
+       description="Create a Lifeline"
+       id="createLifeline1CreationTool"
+       kind="tool"
+       label="Lifeline"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an Action Execution Specification"
+       id="createActionExecutionSpecification2CreationTool"
+       kind="tool"
+       label="Action Execution Specification"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create an BehaviorExecutionSpecification"
+       id="createBehaviorExecutionSpecification3CreationTool"
+       kind="tool"
+       label=" Behavior Execution Specification"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create InteractionUse"
+       id="createInteractionUse4CreationTool"
+       kind="tool"
+       label="InteractionUse"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Combined Fragment"
+       id="createCombinedFragment5CreationTool"
+       kind="tool"
+       label="Combined Fragment"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Interaction Operand"
+       id="createInteractionOperand6CreationTool"
+       kind="tool"
+       label="Interaction Operand"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create Continuation"
+       id="createContinuation7CreationTool"
+       kind="tool"
+       label="Continuation"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create StateInvariant"
+       id="createStateInvariant8CreationTool"
+       kind="tool"
+       label="StateInvariant"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a comment"
+       id="createComment9CreationTool"
+       kind="tool"
+       label="Comment"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a constraint"
+       id="createConstraint10CreationTool"
+       kind="tool"
+       label="Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a CoRegion"
+       id="createCoRegion11CreationTool"
+       kind="tool"
+       label="CoRegion"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Duration Observation on a Message"
+       id="createDurationObservation12CreationTool"
+       kind="tool"
+       label="Duration Observation"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Time Constraint"
+       id="createTimeConstraint13CreationTool"
+       kind="tool"
+       label="Time Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Time Observation"
+       id="createTimeObservation14CreationTool"
+       kind="tool"
+       label="Time Observation"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Duration Constraint"
+       id="createDurationConstraint15CreationTool"
+       kind="tool"
+       label="Duration Constraint"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a Destruction Event"
+       id="createDestructionEvent16CreationTool"
+       kind="tool"
+       label="Destruction Event"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionEvent.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionEvent.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageSync"
+       id="createMessageSync1CreationTool"
+       kind="tool"
+       label="Message Sync"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageAsync"
+       id="createMessageAsync2CreationTool"
+       kind="tool"
+       label="Message Async"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageReply"
+       id="createMessageReply3CreationTool"
+       kind="tool"
+       label="Message Reply"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageCreate"
+       id="createMessageCreate4CreationTool"
+       kind="tool"
+       label="Message Create"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageDelete"
+       id="createMessageDelete5CreationTool"
+       kind="tool"
+       label="Message Delete"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageLost"
+       id="createMessageLost6CreationTool"
+       kind="tool"
+       label="Message Lost"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create MessageFound"
+       id="createMessageFound7CreationTool"
+       kind="tool"
+       label="Message Found"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create GeneralOrdering"
+       id="createGeneralOrdering8CreationTool"
+       kind="tool"
+       label="General Ordering"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a comment link"
+       id="createCommentlink9CreationTool"
+       kind="tool"
+       label="Comment link"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Create a constraint link"
+       id="createConstraintlink10CreationTool"
+       kind="tool"
+       label="Constraint link"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+ 	</entry>
+	<entry
+       defineOnly="true"
+       description="Creation of a context link for a Constraint"
+       id="createContextLink11CreationTool"
+       kind="tool"
+       label="ContextLink"
+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+       path=""
+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+ 	</entry>
+
+			</contribution>
+		</paletteProvider>	
+			
+	</extension>
+
+<extension
+		id="UML Plugin.standard"
+		name="UML Plugin Standard Palette"
+		point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+		
+		<?gmfgen generated="true"?>	
+		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+			<Priority name="Low"/>
+      		<contribution
+            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">
+     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+					<entry
+       description=""
+       id="createNodes1Group"
+       kind="drawer"
+       label="Nodes"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createLifeline1CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createActionExecutionSpecification2CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createBehaviorExecutionSpecification3CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createInteractionUse4CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createCombinedFragment5CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createInteractionOperand6CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createContinuation7CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createStateInvariant8CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createComment9CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createConstraint10CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createCoRegion11CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createDurationObservation12CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createTimeConstraint13CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createTimeObservation14CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createDurationConstraint15CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createDestructionEvent16CreationTool"
+          path="/createNodes1Group">
+    </predefinedEntry>
 
-      <page

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage"

-            name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-            class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramRulersAndGridPreferencePage">

-      </page>

+	<entry
+       description="Message tools"
+       id="createEdges2Group"
+       kind="drawer"
+       label="Edges"
+       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+       path="/"
+       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+       <expand
+              force="true">
+       </expand>
+ 	</entry>
+ 	 
+ 	 	<predefinedEntry
+          id="createMessageSync1CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageAsync2CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageReply3CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageCreate4CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageDelete5CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageLost6CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createMessageFound7CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createGeneralOrdering8CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createCommentlink9CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createConstraintlink10CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
+ 	<predefinedEntry
+          id="createContextLink11CreationTool"
+          path="/createEdges2Group">
+    </predefinedEntry>
 
-   </extension>

 
-<extension

-		id="UML Plugin.palettedefinition"

-		name="UML Plugin Predefined Entries"

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

-		

-		<?gmfgen generated="true"?>	

-		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-			<Priority name="Lowest"/>

-      		<contribution

-            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">

-     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-					<entry

-       defineOnly="true"

-       description="Create a Lifeline"

-       id="createLifeline1CreationTool"

-       kind="tool"

-       label="Lifeline"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Lifeline.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an Action Execution Specification"

-       id="createActionExecutionSpecification2CreationTool"

-       kind="tool"

-       label="Action Execution Specification"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ActionExecutionSpecification.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create an BehaviorExecutionSpecification"

-       id="createBehaviorExecutionSpecification3CreationTool"

-       kind="tool"

-       label=" Behavior Execution Specification"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/BehaviorExecutionSpecification.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create InteractionUse"

-       id="createInteractionUse4CreationTool"

-       kind="tool"

-       label="InteractionUse"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionUse.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Combined Fragment"

-       id="createCombinedFragment5CreationTool"

-       kind="tool"

-       label="Combined Fragment"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Interaction Operand"

-       id="createInteractionOperand6CreationTool"

-       kind="tool"

-       label="Interaction Operand"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InteractionOperand.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create Continuation"

-       id="createContinuation7CreationTool"

-       kind="tool"

-       label="Continuation"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Continuation.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create StateInvariant"

-       id="createStateInvariant8CreationTool"

-       kind="tool"

-       label="StateInvariant"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateInvariant.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a comment"

-       id="createComment9CreationTool"

-       kind="tool"

-       label="Comment"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a constraint"

-       id="createConstraint10CreationTool"

-       kind="tool"

-       label="Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a CoRegion"

-       id="createCoRegion11CreationTool"

-       kind="tool"

-       label="CoRegion"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Duration Observation on a Message"

-       id="createDurationObservation12CreationTool"

-       kind="tool"

-       label="Duration Observation"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Time Constraint"

-       id="createTimeConstraint13CreationTool"

-       kind="tool"

-       label="Time Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Time Observation"

-       id="createTimeObservation14CreationTool"

-       kind="tool"

-       label="Time Observation"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Duration Constraint"

-       id="createDurationConstraint15CreationTool"

-       kind="tool"

-       label="Duration Constraint"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a Destruction Event"

-       id="createDestructionEvent16CreationTool"

-       kind="tool"

-       label="Destruction Event"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionEvent.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestructionEvent.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageSync"

-       id="createMessageSync1CreationTool"

-       kind="tool"

-       label="Message Sync"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageAsync"

-       id="createMessageAsync2CreationTool"

-       kind="tool"

-       label="Message Async"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageReply"

-       id="createMessageReply3CreationTool"

-       kind="tool"

-       label="Message Reply"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageCreate"

-       id="createMessageCreate4CreationTool"

-       kind="tool"

-       label="Message Create"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageDelete"

-       id="createMessageDelete5CreationTool"

-       kind="tool"

-       label="Message Delete"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageLost"

-       id="createMessageLost6CreationTool"

-       kind="tool"

-       label="Message Lost"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create MessageFound"

-       id="createMessageFound7CreationTool"

-       kind="tool"

-       label="Message Found"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create GeneralOrdering"

-       id="createGeneralOrdering8CreationTool"

-       kind="tool"

-       label="General Ordering"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a comment link"

-       id="createCommentlink9CreationTool"

-       kind="tool"

-       label="Comment link"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Create a constraint link"

-       id="createConstraintlink10CreationTool"

-       kind="tool"

-       label="Constraint link"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

- 	</entry>

-	<entry

-       defineOnly="true"

-       description="Creation of a context link for a Constraint"

-       id="createContextLink11CreationTool"

-       kind="tool"

-       label="ContextLink"

-       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-       path=""

-       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

- 	</entry>

-

-			</contribution>

-		</paletteProvider>	

-			

-	</extension>

-

-<extension

-		id="UML Plugin.standard"

-		name="UML Plugin Standard Palette"

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

-		

-		<?gmfgen generated="true"?>	

-		<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-			<Priority name="Low"/>

-      		<contribution

-            	factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">

-     			<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-					<entry

-       description=""

-       id="createNodes1Group"

-       kind="drawer"

-       label="Nodes"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createLifeline1CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createActionExecutionSpecification2CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createBehaviorExecutionSpecification3CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createInteractionUse4CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createCombinedFragment5CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createInteractionOperand6CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createContinuation7CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createStateInvariant8CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createComment9CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createConstraint10CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createCoRegion11CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createDurationObservation12CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createTimeConstraint13CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createTimeObservation14CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createDurationConstraint15CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createDestructionEvent16CreationTool"

-          path="/createNodes1Group">

-    </predefinedEntry>

-

-	<entry

-       description="Message tools"

-       id="createEdges2Group"

-       kind="drawer"

-       label="Edges"

-       large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-       path="/"

-       small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-       <expand

-              force="true">

-       </expand>

- 	</entry>

- 	 

- 	 	<predefinedEntry

-          id="createMessageSync1CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageAsync2CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageReply3CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageCreate4CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageDelete5CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageLost6CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createMessageFound7CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createGeneralOrdering8CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createCommentlink9CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createConstraintlink10CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

- 	<predefinedEntry

-          id="createContextLink11CreationTool"

-          path="/createEdges2Group">

-    </predefinedEntry>

-

-

-			</contribution>

-			<editor id="org.eclipse.papyrus.uml.diagram.sequence"/>

-		</paletteProvider>	

-			

-	</extension>

-

-

-<extension

-      point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">

-   <modelingAssistantProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomModelingAssistantProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

-   </modelingAssistantProvider>

-</extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-      <?gmfgen generated="true"?>

-      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider">

-         <MarkerType name="org.eclipse.papyrus.uml.diagram.sequence.diagnostic"/>

-         <Priority name="Lowest"/>

-      </MarkerNavigationProvider>

-   </extension>

-

-<extension id="diagnostic" name="UML Plugin problems" point="org.eclipse.core.resources.markers">

-      <?gmfgen generated="true"?>

-      <super type="org.eclipse.core.resources.problemmarker"/>

-      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-      <persistent value="true"/>

-   </extension>   

-   <extension point="org.eclipse.emf.validation.constraintProviders">

-      <?gmfgen generated="false"?>

-            <category id="org.eclipse.uml2.uml.util.UMLValidator.validate" mandatory="false" name="validateUMLModel">

-         <![CDATA[Validate the UML model]]>

-      </category>

-      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper" mandatory="false" name="fragmentsOrder">

-         <![CDATA[Fragments order]]>

-      </category>

-      <constraintProvider cache="true">

-         <package namespaceUri="http://www.eclipse.org/uml2/3.0.0/UML"/>

-         <package namespaceUri="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

-               <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate">

-                  </constraints>

-         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper">

-                  <constraint id="FragmentOrderingKeeper.Interaction"

-            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter1"

-            name="Interaction fragment ordering"

-            mode="Live"

-            severity="ERROR" statusCode="200">

-            

-            <description><![CDATA[The fragment property of an Interaction must be ordered as a valid trace.]]></description>

-            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>

-            <target class="uml.Interaction"/>

-         </constraint>

-                  <constraint id="FragmentOrderingKeeper.InteractionOperand"

-            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter2"

-            name="InteractionOperand fragment ordering"

-            mode="Live"

-            severity="ERROR" statusCode="200">

-            

-            <description><![CDATA[The fragment property of an InteractionOperand must be ordered as a valid trace.]]></description>

-            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>

-            <target class="uml.InteractionOperand"/>

-         </constraint>

-                  <constraint id="FragmentOrderingKeeper.LifelineFigure"

-            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomValidationProvider$Adapter3"

-            name="Fragment ordering"

-            mode="Live"

-            severity="ERROR" statusCode="200">

-            

-            <description><![CDATA[The fragment property of an Interaction or InteractionOperand must be ordered as a valid trace.]]></description>

-            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>

-            <?use View and Bounds to detect moves?>

-      		<target class="notation.View"/>

-            <target class="notation.Bounds"/>

-         </constraint>

-                  </constraints>

-      </constraintProvider>

+			</contribution>
+			<editor id="org.eclipse.papyrus.uml.diagram.sequence"/>
+		</paletteProvider>	
+			
+	</extension>
+
+
+<extension
+      point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
+   <modelingAssistantProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomModelingAssistantProvider">
+      <Priority
+            name="Lowest">
+      </Priority>
+   </modelingAssistantProvider>
+</extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+      <?gmfgen generated="true"?>
+      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider">
+         <MarkerType name="org.eclipse.papyrus.uml.diagram.sequence.diagnostic"/>
+         <Priority name="Lowest"/>
+      </MarkerNavigationProvider>
+   </extension>
+
+<extension id="diagnostic" name="UML Plugin problems" point="org.eclipse.core.resources.markers">
+      <?gmfgen generated="true"?>
+      <super type="org.eclipse.core.resources.problemmarker"/>
+      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+      <persistent value="true"/>
+   </extension>   
+   <extension point="org.eclipse.emf.validation.constraintProviders">
+      <?gmfgen generated="false"?>
+            <category id="org.eclipse.uml2.uml.util.UMLValidator.validate" mandatory="false" name="validateUMLModel">
+         <![CDATA[Validate the UML model]]>
+      </category>
+      <category id="org.eclipse.uml2.uml.util.UMLValidator.validate/org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper" mandatory="false" name="fragmentsOrder">
+         <![CDATA[Fragments order]]>
+      </category>
+      <constraintProvider cache="true">
+         <package namespaceUri="http://www.eclipse.org/uml2/3.0.0/UML"/>
+         <package namespaceUri="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
+               <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate">
+                  </constraints>
+         <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validate/org.eclipse.papyrus.uml.diagram.sequence.validation.FragmentOrderingKeeper">
+                  <constraint id="FragmentOrderingKeeper.Interaction"
+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter1"
+            name="Interaction fragment ordering"
+            mode="Live"
+            severity="ERROR" statusCode="200">
+            
+            <description><![CDATA[The fragment property of an Interaction must be ordered as a valid trace.]]></description>
+            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>
+            <target class="uml.Interaction"/>
+         </constraint>
+                  <constraint id="FragmentOrderingKeeper.InteractionOperand"
+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Adapter2"
+            name="InteractionOperand fragment ordering"
+            mode="Live"
+            severity="ERROR" statusCode="200">
+            
+            <description><![CDATA[The fragment property of an InteractionOperand must be ordered as a valid trace.]]></description>
+            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>
+            <target class="uml.InteractionOperand"/>
+         </constraint>
+                  <constraint id="FragmentOrderingKeeper.LifelineFigure"
+            lang="Java" class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomValidationProvider$Adapter3"
+            name="Fragment ordering"
+            mode="Live"
+            severity="ERROR" statusCode="200">
+            
+            <description><![CDATA[The fragment property of an Interaction or InteractionOperand must be ordered as a valid trace.]]></description>
+            <message><![CDATA[There is no valid trace sequencing the InteractionFragments in the fragment property. Some of them can not be organized as a valid sequence :{0}]]></message>
+            <?use View and Bounds to detect moves?>
+      		<target class="notation.View"/>
+            <target class="notation.Bounds"/>
+         </constraint>
+                  </constraints>
+      </constraintProvider>
    </extension>
 
 <extension point="org.eclipse.emf.validation.constraintBindings">
@@ -1291,590 +1274,590 @@
                </binding>
 
    </extension>
-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-      <?gmfgen generated="true"?>

-      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationDecoratorProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-         <context decoratorTargets="PRIMARY_VIEW"/>

-      </decoratorProvider>

-   </extension>

-

+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+      <?gmfgen generated="true"?>
+      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationDecoratorProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+         <context decoratorTargets="PRIMARY_VIEW"/>
+      </decoratorProvider>
+   </extension>
+
 <extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">
       <?gmfgen generated="true"?>
       <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx"/>
       <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001"/>
    </extension>
-<extension

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

-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomEditPolicyProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

-   </editpolicyProvider>

-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomNamespaceEditPolicyProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
+   <editpolicyProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomEditPolicyProvider">
+      <Priority
+            name="Lowest">
+      </Priority>
+   </editpolicyProvider>
+   <editpolicyProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomNamespaceEditPolicyProvider">
+      <Priority
+            name="Lowest">
+      </Priority>
+   </editpolicyProvider>
+   <editpolicyProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.PostEditPolicyProvider">
+      <Priority
+            name="Highest">
+      </Priority>
    </editpolicyProvider>
-   <editpolicyProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.PostEditPolicyProvider">

-      <Priority

-            name="Highest">

-      </Priority>

-   </editpolicyProvider>

-</extension>

-<extension

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

-   <metamodel

-         nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-      <adviceBinding

-            class="org.eclipse.papyrus.uml.diagram.sequence.SequenceViewDependentsAdvice"

-            id="org.eclipse.papyrus.uml.diagram.sequence.viewDependences"

-            inheritance="all"

-            typeId="*">

-      </adviceBinding>

-      <adviceBinding

-            class="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice"

-            id="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd"

-            inheritance="all"

-            typeId="*">

-      </adviceBinding>

-   </metamodel>

-</extension>

-<extension

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

-   <binding

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

-      <advice

-            ref="org.eclipse.papyrus.uml.diagram.sequence.viewDependences">

-      </advice>

-   </binding>

-   <binding

-         context="org.eclipse.papyrus.uml.diagram.sequence.TypeContext">

-      <advice

-            ref="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd">

-      </advice>

-   </binding>

-</extension>

-<extension

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

-   <editpartProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomEditPartProvider">

-      <Priority

-            name="Medium">

-      </Priority>

-      <object

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

-            id="generated-diagram">

-         <method

-               name="getType()"

-               value="PapyrusUMLSequenceDiagram">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-nodes">

-         <method

-               name="getType()"

-               value="2001,3007,3004,3005,3002,3016,3001,3006,3003,3017,3018,3019,3020,3021,3022,3008,3009,3023,3024">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Edge"

-            id="generated-links">

-         <method

-               name="getType()"

-               value="4003,4004,4005,4006,4007,4008,4009,4010,4011,4012">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-labels">

-         <method

-               name="getType()"

-               value="5001,5003,5004,5007,5002,5008,5009,5013,5010,5014,5011,5015,5005,5012,5006,5018,5019,5016,5017">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-compartments">

-         <method

-               name="getType()"

-               value="7001,7004">

-         </method>

-      </object>

-      <context

-            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">

-      </context>

-   </editpartProvider>

-</extension>

-<extension

-      point="org.eclipse.gmf.runtime.diagram.core.viewProviders">

-   <viewProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomViewProvider">

-      <Priority

-            name="Medium">

-      </Priority>

-      <context

-            semanticHints="PapyrusUMLSequenceDiagram"

-            viewClass="org.eclipse.gmf.runtime.notation.Diagram">

-      </context>

-      <context

-            semanticHints="2001,3007,3004,3005,3002,3016,3001,3006,3003,3017,3018,3019,3020,3021,3022,3008,3009,3023,3024"

-            viewClass="org.eclipse.gmf.runtime.notation.Node">

-      </context>

-      <context

-            semanticHints="4003,4004,4005,4006,4007,4008,4009,4010,4011,4012"

-            viewClass="org.eclipse.gmf.runtime.notation.Edge">

-      </context>

-   </viewProvider>

-</extension>

-<extension

-      point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">

-   <modelingAssistantProvider

-         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomModelingAssistantProvider">

-      <Priority

-            name="Medium">

-      </Priority>

-   </modelingAssistantProvider>

-</extension>

-<extension

-      id="Sequence.custom"

-      name="Sequence Custom Palette"

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

-   <paletteProvider

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

-      <Priority

-            name="Medium">

-      </Priority>

-      <contribution

-            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">

-         <predefinedEntry

-               id="/createNodes1Group/createCombinedFragment5CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createDurationObservation12CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createTimeObservation14CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createDurationConstraint15CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createDestructionEvent16CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createComment9CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createNodes1Group/createConstraint10CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageSync1CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageAsync2CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageReply3CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageCreate4CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageDelete5CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageLost6CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createMessageFound7CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createGeneralOrdering8CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createCommentlink9CreationTool"

-               remove="true">

-         </predefinedEntry>

-         <predefinedEntry

-               id="/createEdges2Group/createConstraintlink10CreationTool"

-               remove="true">

-         </predefinedEntry>

-      </contribution>

-      <editor

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

-      </editor>

-      <contribution

-            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequencePaletteFactory">

-         <entry

-               defineOnly="true"

-               description="Create Combined Fragment"

-               id="createCombinedFragmentTool"

-               kind="tool"

-               label="Combined Fragment"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create Consider Ignore Fragment"

-               id="createConsiderIgnoreFragmentTool"

-               kind="tool"

-               label="Consider Ignore Fragment"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a Duration Constraint"

-               id="createDurationConstraintTool"

-               kind="tool"

-               label="Duration Constraint"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a Duration Observation on a Message"

-               id="createDurationObservationTool"

-               kind="tool"

-               label="Duration Observation"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a Time Observation"

-               id="createTimeObservationTool"

-               kind="tool"

-               label="Time Observation"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a Destruction Event"

-               id="createDestructionEventTool"

-               kind="tool"

-               label="Destruction Event"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a comment"

-               id="createCommentTool"

-               kind="tool"

-               label="Comment"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a constraint"

-               id="createConstraintTool"

-               kind="tool"

-               label="Constraint"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageSync"

-               id="createMessageSyncTool"

-               kind="tool"

-               label="Message Sync"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageAsync"

-               id="createMessageAsyncTool"

-               kind="tool"

-               label="Message Async"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageReply"

-               id="createMessageReplyTool"

-               kind="tool"

-               label="Message Reply"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageCreate"

-               id="createMessageCreateTool"

-               kind="tool"

-               label="Message Create"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageDelete"

-               id="createMessageDeleteTool"

-               kind="tool"

-               label="Message Delete"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageLost"

-               id="createMessageLostTool"

-               kind="tool"

-               label="Message Lost"

-               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageLost.gif"

-               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageLost.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create MessageFound"

-               id="createMessageFoundTool"

-               kind="tool"

-               label="Message Found"

-               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageFound.gif"

-               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageFound.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create GeneralOrdering"

-               id="createGeneralOrderingTool"

-               kind="tool"

-               label="General Ordering"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create Annotated Link"

-               id="createAnnotatedLinkTool"

-               kind="tool"

-               label="Link"

-               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Link.gif"

-               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Link.gif">

-         </entry>

-         <entry

-               defineOnly="true"

-               description="Create a Gate"

-               id="createGateTool"

-               kind="tool"

-               label="Gate"

-               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif"

-               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif">

-         </entry>

-      </contribution>

-   </paletteProvider>

-</extension>

-<extension

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

-   <paletteProvider

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

-      <Priority

-            name="High">

-      </Priority>

-      <contribution

-            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequencePaletteFactory">

-         <predefinedEntry

-               id="createCombinedFragmentTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createConsiderIgnoreFragmentTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createDurationConstraintTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createDurationObservationTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createTimeObservationTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createDestructionEventTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createCommentTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createConstraintTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createGateTool"

-               path="/createNodes1Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageSyncTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageAsyncTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageReplyTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageCreateTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageDeleteTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageLostTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createMessageFoundTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createGeneralOrderingTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-         <predefinedEntry

-               id="createAnnotatedLinkTool"

-               path="/createEdges2Group">

-         </predefinedEntry>

-      </contribution>

-      <editor

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

-      </editor>

-   </paletteProvider>

-</extension>

-<extension

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

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_both">

-         </parameter>

-      </class>

-      <activeWhen>

-         <reference

-               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">

-         </reference>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_height">

-         </parameter>

-      </class>

-      <activeWhen>

-         <reference

-               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">

-         </reference>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_width">

-         </parameter>

-      </class>

-      <activeWhen>

-         <reference

-               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">

-         </reference>

-      </activeWhen>

-   </handler>

-</extension>

-<extension

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

-   <definition

-         id="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">

-      <with

-            variable="activeContexts">

-         <iterate

-               ifEmpty="true"

-               operator="or">

-            <equals

-                  value="org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext">

-            </equals>

-         </iterate>

-      </with>

-   </definition>

-</extension>

+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+   <metamodel
+         nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+      <adviceBinding
+            class="org.eclipse.papyrus.uml.diagram.sequence.SequenceViewDependentsAdvice"
+            id="org.eclipse.papyrus.uml.diagram.sequence.viewDependences"
+            inheritance="all"
+            typeId="*">
+      </adviceBinding>
+      <adviceBinding
+            class="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice"
+            id="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd"
+            inheritance="all"
+            typeId="*">
+      </adviceBinding>
+   </metamodel>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+   <binding
+         context="org.eclipse.papyrus.infra.services.edit.TypeContext">
+      <advice
+            ref="org.eclipse.papyrus.uml.diagram.sequence.viewDependences">
+      </advice>
+   </binding>
+   <binding
+         context="org.eclipse.papyrus.uml.diagram.sequence.TypeContext">
+      <advice
+            ref="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd">
+      </advice>
+   </binding>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+   <editpartProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomEditPartProvider">
+      <Priority
+            name="Medium">
+      </Priority>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Diagram"
+            id="generated-diagram">
+         <method
+               name="getType()"
+               value="PapyrusUMLSequenceDiagram">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-nodes">
+         <method
+               name="getType()"
+               value="2001,3007,3004,3005,3002,3016,3001,3006,3003,3017,3018,3019,3020,3021,3022,3008,3009,3023,3024">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Edge"
+            id="generated-links">
+         <method
+               name="getType()"
+               value="4003,4004,4005,4006,4007,4008,4009,4010,4011,4012">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-labels">
+         <method
+               name="getType()"
+               value="5001,5003,5004,5007,5002,5008,5009,5013,5010,5014,5011,5015,5005,5012,5006,5018,5019,5016,5017">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-compartments">
+         <method
+               name="getType()"
+               value="7001,7004">
+         </method>
+      </object>
+      <context
+            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
+      </context>
+   </editpartProvider>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
+   <viewProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomViewProvider">
+      <Priority
+            name="Medium">
+      </Priority>
+      <context
+            semanticHints="PapyrusUMLSequenceDiagram"
+            viewClass="org.eclipse.gmf.runtime.notation.Diagram">
+      </context>
+      <context
+            semanticHints="2001,3007,3004,3005,3002,3016,3001,3006,3003,3017,3018,3019,3020,3021,3022,3008,3009,3023,3024"
+            viewClass="org.eclipse.gmf.runtime.notation.Node">
+      </context>
+      <context
+            semanticHints="4003,4004,4005,4006,4007,4008,4009,4010,4011,4012"
+            viewClass="org.eclipse.gmf.runtime.notation.Edge">
+      </context>
+   </viewProvider>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
+   <modelingAssistantProvider
+         class="org.eclipse.papyrus.uml.diagram.sequence.providers.CustomModelingAssistantProvider">
+      <Priority
+            name="Medium">
+      </Priority>
+   </modelingAssistantProvider>
+</extension>
+<extension
+      id="Sequence.custom"
+      name="Sequence Custom Palette"
+      point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
+   <paletteProvider
+         class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+      <Priority
+            name="Medium">
+      </Priority>
+      <contribution
+            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.part.UMLPaletteFactory">
+         <predefinedEntry
+               id="/createNodes1Group/createCombinedFragment5CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createDurationObservation12CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createTimeObservation14CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createDurationConstraint15CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createDestructionEvent16CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createComment9CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createNodes1Group/createConstraint10CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageSync1CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageAsync2CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageReply3CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageCreate4CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageDelete5CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageLost6CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createMessageFound7CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createGeneralOrdering8CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createCommentlink9CreationTool"
+               remove="true">
+         </predefinedEntry>
+         <predefinedEntry
+               id="/createEdges2Group/createConstraintlink10CreationTool"
+               remove="true">
+         </predefinedEntry>
+      </contribution>
+      <editor
+            id="org.eclipse.papyrus.uml.diagram.sequence">
+      </editor>
+      <contribution
+            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequencePaletteFactory">
+         <entry
+               defineOnly="true"
+               description="Create Combined Fragment"
+               id="createCombinedFragmentTool"
+               kind="tool"
+               label="Combined Fragment"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CombinedFragment.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create Consider Ignore Fragment"
+               id="createConsiderIgnoreFragmentTool"
+               kind="tool"
+               label="Consider Ignore Fragment"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConsiderIgnoreFragment.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a Duration Constraint"
+               id="createDurationConstraintTool"
+               kind="tool"
+               label="Duration Constraint"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationConstraint.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a Duration Observation on a Message"
+               id="createDurationObservationTool"
+               kind="tool"
+               label="Duration Observation"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a Time Observation"
+               id="createTimeObservationTool"
+               kind="tool"
+               label="Time Observation"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a Destruction Event"
+               id="createDestructionEventTool"
+               kind="tool"
+               label="Destruction Event"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DestroyObjectAction.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a comment"
+               id="createCommentTool"
+               kind="tool"
+               label="Comment"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a constraint"
+               id="createConstraintTool"
+               kind="tool"
+               label="Constraint"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageSync"
+               id="createMessageSyncTool"
+               kind="tool"
+               label="Message Sync"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_synchCall.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageAsync"
+               id="createMessageAsyncTool"
+               kind="tool"
+               label="Message Async"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_asynchCall.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageReply"
+               id="createMessageReplyTool"
+               kind="tool"
+               label="Message Reply"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_reply.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageCreate"
+               id="createMessageCreateTool"
+               kind="tool"
+               label="Message Create"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_createMessage.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageDelete"
+               id="createMessageDeleteTool"
+               kind="tool"
+               label="Message Delete"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Message_deleteMessage.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageLost"
+               id="createMessageLostTool"
+               kind="tool"
+               label="Message Lost"
+               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageLost.gif"
+               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageLost.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create MessageFound"
+               id="createMessageFoundTool"
+               kind="tool"
+               label="Message Found"
+               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageFound.gif"
+               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/MessageFound.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create GeneralOrdering"
+               id="createGeneralOrderingTool"
+               kind="tool"
+               label="General Ordering"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/GeneralOrdering.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create Annotated Link"
+               id="createAnnotatedLinkTool"
+               kind="tool"
+               label="Link"
+               large_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Link.gif"
+               small_icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Link.gif">
+         </entry>
+         <entry
+               defineOnly="true"
+               description="Create a Gate"
+               id="createGateTool"
+               kind="tool"
+               label="Gate"
+               large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif"
+               small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Gate.gif">
+         </entry>
+      </contribution>
+   </paletteProvider>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
+   <paletteProvider
+         class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+      <Priority
+            name="High">
+      </Priority>
+      <contribution
+            factoryClass="org.eclipse.papyrus.uml.diagram.sequence.SequencePaletteFactory">
+         <predefinedEntry
+               id="createCombinedFragmentTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createConsiderIgnoreFragmentTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createDurationConstraintTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createDurationObservationTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createTimeObservationTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createDestructionEventTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createCommentTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createConstraintTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createGateTool"
+               path="/createNodes1Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageSyncTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageAsyncTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageReplyTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageCreateTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageDeleteTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageLostTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createMessageFoundTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createGeneralOrderingTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+         <predefinedEntry
+               id="createAnnotatedLinkTool"
+               path="/createEdges2Group">
+         </predefinedEntry>
+      </contribution>
+      <editor
+            id="org.eclipse.papyrus.uml.diagram.sequence">
+      </editor>
+   </paletteProvider>
+</extension>
+<extension
+      point="org.eclipse.ui.handlers">
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_both">
+         </parameter>
+      </class>
+      <activeWhen>
+         <reference
+               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">
+         </reference>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_height">
+         </parameter>
+      </class>
+      <activeWhen>
+         <reference
+               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">
+         </reference>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.sequence.handlers.CustomSizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_width">
+         </parameter>
+      </class>
+      <activeWhen>
+         <reference
+               definitionId="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">
+         </reference>
+      </activeWhen>
+   </handler>
+</extension>
+<extension
+      point="org.eclipse.core.expressions.definitions">
+   <definition
+         id="org.eclipse.papyrus.uml.diagram.sequence.customHandlerActivation">
+      <with
+            variable="activeContexts">
+         <iterate
+               ifEmpty="true"
+               operator="or">
+            <equals
+                  value="org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext">
+            </equals>
+         </iterate>
+      </with>
+   </definition>
+</extension>
+
+
+    <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <dynamic
+               class="org.eclipse.papyrus.uml.diagram.sequence.providers.DurationConstraintContributionItem"
+               id="org.eclipse.papyrus.sequence.duraitonconstraint.DynamicMenu">
+         </dynamic>
+         <dynamic
+               class="org.eclipse.papyrus.uml.diagram.sequence.providers.DisplayBehaviorContributionItem"
+               id="org.eclipse.papyrus.uml.diagram.sequence.displayBehaviorMenu">
+         </dynamic>
+      </menuContribution>
+   </extension>
+   
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+		<diagramMappings diagramID="PapyrusUMLSequenceDiagram">
+			<mapping type="PapyrusUMLSequenceDiagram" humanReadableType="SequenceDiagram"/>
+			
+	<mapping
+		humanReadableType="Interaction"
+		type="7001">
+	</mapping>
 
+	<mapping
+		humanReadableType="CombinedFragment"
+		type="7004">
+	</mapping>
+		</diagramMappings>
+	</extension>
 
-    <extension

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

-      <menuContribution

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

-         <dynamic

-               class="org.eclipse.papyrus.uml.diagram.sequence.providers.DurationConstraintContributionItem"

-               id="org.eclipse.papyrus.sequence.duraitonconstraint.DynamicMenu">

-         </dynamic>

-         <dynamic

-               class="org.eclipse.papyrus.uml.diagram.sequence.providers.DisplayBehaviorContributionItem"

-               id="org.eclipse.papyrus.uml.diagram.sequence.displayBehaviorMenu">

-         </dynamic>

-      </menuContribution>

-   </extension>

-   

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

-		<diagramMappings diagramID="PapyrusUMLSequenceDiagram">

-			<mapping type="PapyrusUMLSequenceDiagram" humanReadableType="SequenceDiagram"/>

-			

-	<mapping

-		humanReadableType="Interaction"

-		type="7001">

-	</mapping>

-

-	<mapping

-		humanReadableType="CombinedFragment"

-		type="7004">

-	</mapping>

-		</diagramMappings>

-	</extension>

-

 
-   <!-- optionally, specify keybindings -->

-</plugin>

+   <!-- optionally, specify keybindings -->
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 23d5e4f767f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *

- *

- * 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:

- *   Atos Origin - Initial API and implementation

- *

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

-package org.eclipse.papyrus.uml.diagram.sequence.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 8d3ca3f790f..da16e9b1266 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -1,1102 +1,1085 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<!--

- Copyright (c) 2009, 2014 MOSKitt, CEA and others.

- 

- All rights reserved. This program and the accompanying materials

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

- which accompanies this distribution, and is available at

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

- 

- Contributors:

-   MOSKitt - Initial API and implementation

-   Christian W. Damus (CEA) - bug 323802

-   

--->

-<plugin>

-

-      

-   <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.statemachine.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

-

-   <extension id="diagnostic" name="PapyrusUMLStateMachineDiagram problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension>   

-

-   <extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPreferenceInitializer"/>

-   </extension>

-

-   <extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-      name="PapyrusUMLStateMachineDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"

-      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

-

-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.statemachine"

-            labelProvider="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

-

-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.statemachine">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

-

-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.statemachine">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-      </propertySections>

-   </extension>

-

-

-<?gmfgen generated="true"?>

-

-	

-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLStateMachineDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2000,3000,5000,6000,8000,9000,10000,11000,12000,13000,14000,15000,16000,17000,18000,666,668,680,690,691,692"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="7000,19000,667,670,8500"/>

-      </viewProvider>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-      <?gmfgen generated="true"?>

-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLEditPartProvider">

-         <Priority name="Lowest"/>

-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-            <method name="getType()" value="PapyrusUMLStateMachineDiagram"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-            <method name="getType()" value="2000,3000,5000,6000,8000,9000,10000,11000,12000,13000,14000,15000,16000,17000,18000,666,668,680,690,691,692"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-            <method name="getType()" value="7000,19000,667,670,8500"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-            <method name="getType()" value="2001,5001,5002,6001,8001,8002,9001,9002,10001,10002,11001,11002,12001,12002,13001,13002,14001,14002,15001,15002,16001,16002,17001,17002,18001,18002,6666,6668,6669"/>

-         </object>

-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-            <method name="getType()" value="3002,2002,6002"/>

-         </object>

-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-      </editpartProvider>

-   </extension>

-

-   

-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

-

-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.StateMachine_2000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="StateMachine"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateMachineEditHelper">

-            <param name="semanticHint" value="2000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Region_3000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Region"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.RegionEditHelper">

-            <param name="semanticHint" value="3000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.FinalState_5000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="FinalState"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.FinalStateEditHelper">

-            <param name="semanticHint" value="5000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.State_6000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="State"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateEditHelper">

-            <param name="semanticHint" value="6000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_8000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="8000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_9000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="9000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_10000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="10000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_11000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="11000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_12000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="12000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_13000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="13000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_14000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="14000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_15000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="15000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_16000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="16000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Pseudostate_17000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Pseudostate"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">

-            <param name="semanticHint" value="17000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ConnectionPointReference_18000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ConnectionPointReference"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ConnectionPointReferenceEditHelper">

-            <param name="semanticHint" value="18000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_666"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="666"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_668"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="668"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Transition_680"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"/>

-            <param name="semanticHint" value="680"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Behavior_690"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Behavior"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.EntryStateBehaviorEditHelper">

-            <param name="semanticHint" value="690"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Behavior_691"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Behavior"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.DoActivityStateBehaviorEditHelper">

-            <param name="semanticHint" value="691"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Behavior_692"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Behavior"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ExitStateBehaviorEditHelper">

-            <param name="semanticHint" value="692"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Transition_7000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Transition"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.TransitionEditHelper">

-            <param name="semanticHint" value="7000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_19000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="19000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_667"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="667"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_670"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="670"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintContext_8500"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="8500"/>

-         </specializationType>

-      </metamodel>

-   </extension>

-

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

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.State_6000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

-	   

-	   

-      

-	      <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

-   

-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.statemachine.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.statemachine.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

-

-   <extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.statemachine.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-

-   <extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.statemachine.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.statemachine.part.LoadResourceAction"/>

-   </extension>

-

-<!-- Diagram creation command and handler -->

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

-	<command id="org.eclipse.papyrus.uml.diagram.statemachine.CreationCommand"

-		name="Create a new StateMachine Diagram"

-		description="Create a new StateMachine Diagram"

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

-</extension>

-

-

-<!-- Diagram creation command registration in menu and toolbar -->

-   

-   <extension

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

-      <editorDiagram

-            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"

-            factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramEditorFactory"

-            icon="icons/obj16/Diagram_StateMachine.gif">

-      </editorDiagram>

-      <creationCommand

-            creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand"

-            creationCondition="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramCreationCondition"

-            icon="icons/obj16/Diagram_StateMachine.gif"

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

-            language="uml"

-            label="UML StateMachine Diagram">

-      </creationCommand>

-   </extension>

-

-<extension

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

-   <editpartProvider

-         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.providers.CustomUMLEditPartProvider">

-      <Priority

-            name="Highest">

-      </Priority>

-      <object

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

-            id="generated-diagram">

-         <method

-               name="getType()"

-               value="PapyrusUMLStateMachineDiagram">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-nodes">

-         <method

-               name="getType()"

-               value="2000,3000,4000">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Edge"

-            id="generated-links">

-         <method

-               name="getType()">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-labels">

-         <method

-               name="getType()"

-               value="2001,3001">

-         </method>

-      </object>

-      <object

-            class="org.eclipse.gmf.runtime.notation.Node"

-            id="generated-compartments">

-         <method

-               name="getType()"

-               value="3002,2002,4002">

-         </method>

-      </object>

-      <context

-            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">

-      </context>

-   </editpartProvider>

-</extension>

-

-

-

-

-

-

-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

-<extension

-      id="ui-context"

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

-   <context

-         description="%context.description"

-         id="org.eclipse.papyrus.uml.diagram.statemachine.ui.diagramContext"

-         name="%context.name"

-         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-   </context>

-</extension>

-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

-<extension point="org.eclipse.emf.validation.constraintProviders">

-      <?gmfgen generated="true"?>

-            <category id="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition" mandatory="false" name="validateInternalTransition">

-         <![CDATA[Validate internal transition]]>

-      </category>

-      <constraintProvider cache="true">

-         <package namespaceUri="http://www.eclipse.org/uml2/5.0.0/UML"/>

-               <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition">

-                  <constraint id="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition_sameTargetAndSrouce"

-            lang="OCL"

-            name="validateInternalTransitionEnd"

-            mode="Live"

-            severity="ERROR" statusCode="200">

-            <![CDATA[(kind = TransitionKind::internal) implies (source.oclIsKindOf (State) and source = target)]]>

-            <description><![CDATA[Validate that internal transition has the same state for source and target]]></description>

-            <message><![CDATA[Validate that internal transition has the same state for source and target]]></message>

-            <target class="uml.Transition"/>

-         </constraint>

-                  </constraints>

-      </constraintProvider>

-   </extension>

-

-<extension point="org.eclipse.emf.validation.constraintBindings">

-      <?gmfgen generated="true"?>

-      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx">

-         <selector class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationProvider$DefaultCtx"/>

-      </clientContext>

-      <binding context="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx">

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.statemachine.org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition_sameTargetAndSrouce"/>

-               </binding>

-

-   </extension>

-

-<extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">

-      <?gmfgen generated="true"?>

-         <clientContext id="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx"/>

-      </extension>

- 

- <extension

-      point="org.eclipse.emf.transaction.listeners">

-   <listener

-         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners.StateBehaviorsListener">

-      <editingDomain

-            id="org.eclipse.papyrus.SharedEditingDomainID">

-      </editingDomain>

-   </listener>

-	   <listener

-	         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners.InternalStateListener">

-	      <editingDomain

-	            id="org.eclipse.papyrus.SharedEditingDomainID">

-	      </editingDomain>

-	   </listener>

-	</extension>

-

-

-   <!-- optionally, specify keybindings -->

-   

-   <!-- Diagram specific advices -->

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

-

-	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">

-

-	<!-- Region specific advice (eventually adapt other regions, if a region gets deleted -->		

-	<adviceBinding id="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"

-		class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"

-		inheritance="all" typeId="org.eclipse.papyrus.uml.Region">

-	</adviceBinding>

-		

-	</metamodel>

-</extension>

-

-<!-- UML ElementType bindings to Papyrus shared IClientContext -->

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

-

-	<!-- Bindings declaration to shared IClientContext -->

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

-		<elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"/>

-	</binding>

-		

-</extension>

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

-		<diagramMappings diagramID="PapyrusUMLStateMachineDiagram">

-			<mapping type="PapyrusUMLStateMachineDiagram" humanReadableType="StateMachineDiagram"/>

-			

-	<mapping

-		humanReadableType="Region"

-		type="3002">

-	</mapping>

-

-	<mapping

-		humanReadableType="StateMachine"

-		type="2002">

-	</mapping>

-

-	<mapping

-		humanReadableType="State"

-		type="6002">

-	</mapping>

-		</diagramMappings>

-	</extension>

-

-

-

-

-

-

-<extension

-			id="PapyrusUMLStateMachineDiagram.palettedefinition"

-			name="PapyrusUMLStateMachineDiagram Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Region"

-				      id="createRegionCreationTool"

-				      kind="tool"

-				      label="Region"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="State"

-				      id="createStateCreationTool"

-				      kind="tool"

-				      label="State"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Initial"

-				      id="createInitialCreationTool"

-				      kind="tool"

-				      label="Initial"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="FinalState"

-				      id="createFinalStateCreationTool"

-				      kind="tool"

-				      label="FinalState"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="ShallowHistory"

-				      id="createShallowHistoryCreationTool"

-				      kind="tool"

-				      label="ShallowHistory"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="DeepHistory"

-				      id="createDeepHistoryCreationTool"

-				      kind="tool"

-				      label="DeepHistory"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Fork"

-				      id="createForkCreationTool"

-				      kind="tool"

-				      label="Fork"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Join"

-				      id="createJoinCreationTool"

-				      kind="tool"

-				      label="Join"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Choice"

-				      id="createChoiceCreationTool"

-				      kind="tool"

-				      label="Choice"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Junction"

-				      id="createJunctionCreationTool"

-				      kind="tool"

-				      label="Junction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="EntryPoint"

-				      id="createEntryPointCreationTool"

-				      kind="tool"

-				      label="EntryPoint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="ExitPoint"

-				      id="createExitPointCreationTool"

-				      kind="tool"

-				      label="ExitPoint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Terminate"

-				      id="createTerminateCreationTool"

-				      kind="tool"

-				      label="Terminate"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="ConnectionPointReference"

-				      id="createConnectionPointReferenceCreationTool"

-				      kind="tool"

-				      label="ConnectionPointReference"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Comment"

-				      id="createStateMachineCommentCreationTool"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Constraint"

-				      id="createConstraintCreationTool"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Transition"

-				      id="createTransitionCreationTool"

-				      kind="tool"

-				      label="Transition"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a link for comment, constraint"

-				      id="createCommentlinkCreationTool"

-				      kind="tool"

-				      label="Link"

-				      large_icon="icons/obj16/Link.gif"

-				      path=""

-				      small_icon="icons/obj16/Link.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Creation of a context link for a Constraint"

-				      id="createContextLink3CreationTool"

-				      kind="tool"

-				      label="ContextLink"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

-

-<extension

-	id="PapyrusUMLStateMachineDiagram.standard"

-	name="PapyrusUMLStateMachineDiagram Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description=""

-		      id="createNodesGroup"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createRegionCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createStateCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createInitialCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createFinalStateCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createShallowHistoryCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createDeepHistoryCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createForkCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createJoinCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createChoiceCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createJunctionCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createEntryPointCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createExitPointCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createTerminateCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createConnectionPointReferenceCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createStateMachineCommentCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createConstraintCreationTool"

-		        path="/createNodesGroup">

-		  </predefinedEntry>

-		<entry

-		      description=""

-		      id="createEdgesGroup"

-		      kind="drawer"

-		      label="Edges"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="createTransitionCreationTool"

-		        path="/createEdgesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createCommentlinkCreationTool"

-		        path="/createEdgesGroup">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="createContextLink3CreationTool"

-		        path="/createEdgesGroup">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

-

-

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ Copyright (c) 2009, 2014 MOSKitt, CEA and others.
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+   MOSKitt - Initial API and implementation
+   Christian W. Damus (CEA) - bug 323802
+   
+-->
+<plugin>
+
+      
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.statemachine.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+   <extension id="diagnostic" name="PapyrusUMLStateMachineDiagram problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension>   
+
+   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPreferenceInitializer"/>
+   </extension>
+
+   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"
+      name="PapyrusUMLStateMachineDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"
+      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLStateMachineDiagram"
+      class="org.eclipse.papyrus.uml.diagram.statemachine.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.statemachine"
+            labelProvider="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.statemachine">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.statemachine">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.statemachine.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+      </propertySections>
+   </extension>
+
+
+<?gmfgen generated="true"?>
+
+	
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLStateMachineDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2000,3000,5000,6000,8000,9000,10000,11000,12000,13000,14000,15000,16000,17000,18000,666,668,680,690,691,692"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="7000,19000,667,670,8500"/>
+      </viewProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+      <?gmfgen generated="true"?>
+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLEditPartProvider">
+         <Priority name="Lowest"/>
+         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+            <method name="getType()" value="PapyrusUMLStateMachineDiagram"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+            <method name="getType()" value="2000,3000,5000,6000,8000,9000,10000,11000,12000,13000,14000,15000,16000,17000,18000,666,668,680,690,691,692"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+            <method name="getType()" value="7000,19000,667,670,8500"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+            <method name="getType()" value="2001,5001,5002,6001,8001,8002,9001,9002,10001,10002,11001,11002,12001,12002,13001,13002,14001,14002,15001,15002,16001,16002,17001,17002,18001,18002,6666,6668,6669"/>
+         </object>
+         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+            <method name="getType()" value="3002,2002,6002"/>
+         </object>
+         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+      </editpartProvider>
+   </extension>
+
+   
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000"
+               name="%metatype.name.StateMachine_2000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="StateMachine"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateMachineEditHelper">
+            <param name="semanticHint" value="2000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000"
+               name="%metatype.name.Region_3000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Region"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.RegionEditHelper">
+            <param name="semanticHint" value="3000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"
+               name="%metatype.name.FinalState_5000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="FinalState"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.FinalStateEditHelper">
+            <param name="semanticHint" value="5000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.State_6000"
+               name="%metatype.name.State_6000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="State"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.StateEditHelper">
+            <param name="semanticHint" value="6000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"
+               name="%metatype.name.Pseudostate_8000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="8000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"
+               name="%metatype.name.Pseudostate_9000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="9000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"
+               name="%metatype.name.Pseudostate_10000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="10000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"
+               name="%metatype.name.Pseudostate_11000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="11000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"
+               name="%metatype.name.Pseudostate_12000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="12000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"
+               name="%metatype.name.Pseudostate_13000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="13000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"
+               name="%metatype.name.Pseudostate_14000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="14000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"
+               name="%metatype.name.Pseudostate_15000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="15000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"
+               name="%metatype.name.Pseudostate_16000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="16000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"
+               name="%metatype.name.Pseudostate_17000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Pseudostate"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.PseudostateEditHelper">
+            <param name="semanticHint" value="17000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"
+               name="%metatype.name.ConnectionPointReference_18000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ConnectionPointReference"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ConnectionPointReferenceEditHelper">
+            <param name="semanticHint" value="18000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment"
+               name="%metatype.name.Comment_666"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="666"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668"
+               name="%metatype.name.Constraint_668"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="668"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680"
+               name="%metatype.name.Transition_680"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"/>
+            <param name="semanticHint" value="680"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690"
+               name="%metatype.name.Behavior_690"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Behavior"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.EntryStateBehaviorEditHelper">
+            <param name="semanticHint" value="690"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691"
+               name="%metatype.name.Behavior_691"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Behavior"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.DoActivityStateBehaviorEditHelper">
+            <param name="semanticHint" value="691"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692"
+               name="%metatype.name.Behavior_692"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Behavior"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.ExitStateBehaviorEditHelper">
+            <param name="semanticHint" value="692"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"
+               name="%metatype.name.Transition_7000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Transition"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.TransitionEditHelper">
+            <param name="semanticHint" value="7000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"
+               name="%metatype.name.Generalization_19000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.statemachine.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="19000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667"
+               name="%metatype.name.CommentAnnotatedElement_667"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="667"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670"
+               name="%metatype.name.ConstraintConstrainedElement_670"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="670"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500"
+               name="%metatype.name.ConstraintContext_8500"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="8500"/>
+         </specializationType>
+      </metamodel>
+   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.State_6000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
+	   
+	   
+      
+   
+
+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.statemachine.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+   <extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.statemachine.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.statemachine.part.LoadResourceAction"/>
+   </extension>
+
+<!-- Diagram creation command and handler -->
+<extension point="org.eclipse.ui.commands">
+	<command id="org.eclipse.papyrus.uml.diagram.statemachine.CreationCommand"
+		name="Create a new StateMachine Diagram"
+		description="Create a new StateMachine Diagram"
+		categoryId="org.eclipse.papyrus.editor.category"/>
+</extension>
+
+
+<!-- Diagram creation command registration in menu and toolbar -->
+   
+   <extension
+         point="org.eclipse.papyrus.infra.core.papyrusDiagram">
+      <editorDiagram
+            actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
+            factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramEditorFactory"
+            icon="icons/obj16/Diagram_StateMachine.gif">
+      </editorDiagram>
+      <creationCommand
+            creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand"
+            creationCondition="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineDiagramCreationCondition"
+            icon="icons/obj16/Diagram_StateMachine.gif"
+            id="org.eclipse.papyrus.uml.diagram.statemachine.CreationCommand"
+            language="uml"
+            label="UML StateMachine Diagram">
+      </creationCommand>
+   </extension>
+
+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
+   <editpartProvider
+         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.providers.CustomUMLEditPartProvider">
+      <Priority
+            name="Highest">
+      </Priority>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Diagram"
+            id="generated-diagram">
+         <method
+               name="getType()"
+               value="PapyrusUMLStateMachineDiagram">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-nodes">
+         <method
+               name="getType()"
+               value="2000,3000,4000">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Edge"
+            id="generated-links">
+         <method
+               name="getType()">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-labels">
+         <method
+               name="getType()"
+               value="2001,3001">
+         </method>
+      </object>
+      <object
+            class="org.eclipse.gmf.runtime.notation.Node"
+            id="generated-compartments">
+         <method
+               name="getType()"
+               value="3002,2002,4002">
+         </method>
+      </object>
+      <context
+            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
+      </context>
+   </editpartProvider>
+</extension>
+
+
+
+
+
+
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
+<extension
+      id="ui-context"
+      point="org.eclipse.ui.contexts">
+   <context
+         description="%context.description"
+         id="org.eclipse.papyrus.uml.diagram.statemachine.ui.diagramContext"
+         name="%context.name"
+         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+   </context>
+</extension>
+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
+<extension point="org.eclipse.emf.validation.constraintProviders">
+      <?gmfgen generated="true"?>
+            <category id="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition" mandatory="false" name="validateInternalTransition">
+         <![CDATA[Validate internal transition]]>
+      </category>
+      <constraintProvider cache="true">
+         <package namespaceUri="http://www.eclipse.org/uml2/5.0.0/UML"/>
+               <constraints categories="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition">
+                  <constraint id="org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition_sameTargetAndSrouce"
+            lang="OCL"
+            name="validateInternalTransitionEnd"
+            mode="Live"
+            severity="ERROR" statusCode="200">
+            <![CDATA[(kind = TransitionKind::internal) implies (source.oclIsKindOf (State) and source = target)]]>
+            <description><![CDATA[Validate that internal transition has the same state for source and target]]></description>
+            <message><![CDATA[Validate that internal transition has the same state for source and target]]></message>
+            <target class="uml.Transition"/>
+         </constraint>
+                  </constraints>
+      </constraintProvider>
+   </extension>
+
+<extension point="org.eclipse.emf.validation.constraintBindings">
+      <?gmfgen generated="true"?>
+      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx">
+         <selector class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLValidationProvider$DefaultCtx"/>
+      </clientContext>
+      <binding context="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx">
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.statemachine.org.eclipse.uml2.uml.util.UMLValidator.validateInternalTransition_sameTargetAndSrouce"/>
+               </binding>
+
+   </extension>
+
+<extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">
+      <?gmfgen generated="true"?>
+         <clientContext id="org.eclipse.papyrus.uml.diagram.statemachineDefaultCtx"/>
+      </extension>
+ 
+ <extension
+      point="org.eclipse.emf.transaction.listeners">
+   <listener
+         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners.StateBehaviorsListener">
+      <editingDomain
+            id="org.eclipse.papyrus.SharedEditingDomainID">
+      </editingDomain>
+   </listener>
+	   <listener
+	         class="org.eclipse.papyrus.uml.diagram.statemachine.custom.listeners.InternalStateListener">
+	      <editingDomain
+	            id="org.eclipse.papyrus.SharedEditingDomainID">
+	      </editingDomain>
+	   </listener>
+	</extension>
+
+
+   <!-- optionally, specify keybindings -->
+   
+   <!-- Diagram specific advices -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+
+	<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
+
+	<!-- Region specific advice (eventually adapt other regions, if a region gets deleted -->		
+	<adviceBinding id="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"
+		class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"
+		inheritance="all" typeId="org.eclipse.papyrus.uml.Region">
+	</adviceBinding>
+		
+	</metamodel>
+</extension>
+
+<!-- UML ElementType bindings to Papyrus shared IClientContext -->
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration to shared IClientContext -->
+	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">	
+		<elementType ref="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.RegionHelperAdvice"/>
+	</binding>
+		
+</extension>
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+		<diagramMappings diagramID="PapyrusUMLStateMachineDiagram">
+			<mapping type="PapyrusUMLStateMachineDiagram" humanReadableType="StateMachineDiagram"/>
+			
+	<mapping
+		humanReadableType="Region"
+		type="3002">
+	</mapping>
+
+	<mapping
+		humanReadableType="StateMachine"
+		type="2002">
+	</mapping>
+
+	<mapping
+		humanReadableType="State"
+		type="6002">
+	</mapping>
+		</diagramMappings>
+	</extension>
+
+
+
+
+
+
+<extension
+			id="PapyrusUMLStateMachineDiagram.palettedefinition"
+			name="PapyrusUMLStateMachineDiagram Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Region"
+				      id="createRegionCreationTool"
+				      kind="tool"
+				      label="Region"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Region.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="State"
+				      id="createStateCreationTool"
+				      kind="tool"
+				      label="State"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/State.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Initial"
+				      id="createInitialCreationTool"
+				      kind="tool"
+				      label="Initial"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_initial.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="FinalState"
+				      id="createFinalStateCreationTool"
+				      kind="tool"
+				      label="FinalState"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FinalState.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="ShallowHistory"
+				      id="createShallowHistoryCreationTool"
+				      kind="tool"
+				      label="ShallowHistory"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_shallowHistory.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="DeepHistory"
+				      id="createDeepHistoryCreationTool"
+				      kind="tool"
+				      label="DeepHistory"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_deepHistory.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Fork"
+				      id="createForkCreationTool"
+				      kind="tool"
+				      label="Fork"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_fork.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Join"
+				      id="createJoinCreationTool"
+				      kind="tool"
+				      label="Join"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_join.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Choice"
+				      id="createChoiceCreationTool"
+				      kind="tool"
+				      label="Choice"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_choice.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Junction"
+				      id="createJunctionCreationTool"
+				      kind="tool"
+				      label="Junction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_junction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="EntryPoint"
+				      id="createEntryPointCreationTool"
+				      kind="tool"
+				      label="EntryPoint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_entryPoint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="ExitPoint"
+				      id="createExitPointCreationTool"
+				      kind="tool"
+				      label="ExitPoint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_exitPoint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Terminate"
+				      id="createTerminateCreationTool"
+				      kind="tool"
+				      label="Terminate"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Pseudostate_terminate.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="ConnectionPointReference"
+				      id="createConnectionPointReferenceCreationTool"
+				      kind="tool"
+				      label="ConnectionPointReference"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ConnectionPointReference.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Comment"
+				      id="createStateMachineCommentCreationTool"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Constraint"
+				      id="createConstraintCreationTool"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Transition"
+				      id="createTransitionCreationTool"
+				      kind="tool"
+				      label="Transition"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Transition_local.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a link for comment, constraint"
+				      id="createCommentlinkCreationTool"
+				      kind="tool"
+				      label="Link"
+				      large_icon="icons/obj16/Link.gif"
+				      path=""
+				      small_icon="icons/obj16/Link.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Creation of a context link for a Constraint"
+				      id="createContextLink3CreationTool"
+				      kind="tool"
+				      label="ContextLink"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
+
+<extension
+	id="PapyrusUMLStateMachineDiagram.standard"
+	name="PapyrusUMLStateMachineDiagram Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.statemachine.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description=""
+		      id="createNodesGroup"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createRegionCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createStateCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createInitialCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createFinalStateCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createShallowHistoryCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createDeepHistoryCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createForkCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createJoinCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createChoiceCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createJunctionCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createEntryPointCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createExitPointCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createTerminateCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createConnectionPointReferenceCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createStateMachineCommentCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createConstraintCreationTool"
+		        path="/createNodesGroup">
+		  </predefinedEntry>
+		<entry
+		      description=""
+		      id="createEdgesGroup"
+		      kind="drawer"
+		      label="Edges"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="createTransitionCreationTool"
+		        path="/createEdgesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createCommentlinkCreationTool"
+		        path="/createEdgesGroup">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="createContextLink3CreationTool"
+		        path="/createEdgesGroup">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.statemachine"/>
+	</paletteProvider>	
+		
+</extension>
+
+
+
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 250d537e06f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.statemachine.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
index 3d4ca460603..22c9c512343 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/plugin.xml
@@ -15,39 +15,39 @@
 -->
 <plugin>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.timing.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.timing.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.timing.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.timing.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
 
-   <extension id="diagnostic" name="Papyrus Timing Diagram  problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

+   <extension id="diagnostic" name="Papyrus Timing Diagram  problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
 				   </extension>   
 
-   <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

+   <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
 
 
 	<?gmfgen generated="true"?>
@@ -55,107 +55,107 @@
 	<?gmfgen generated="true"?>
 
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.timing"

-            labelProvider="org.eclipse.papyrus.uml.diagram.timing.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.timing"
+            labelProvider="org.eclipse.papyrus.uml.diagram.timing.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.timing">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.timing">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.timing">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.timing.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-         </propertySection>

-      </propertySections>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.timing">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.timing.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+            <input type="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+         </propertySection>
+      </propertySections>
+   </extension>
 
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"

-      name="PapyrusUMLTimingDiagram Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"

-      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"

-      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"
+      name="PapyrusUMLTimingDiagram Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"
+      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLTimingDiagram"
+      class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
    
     <?gmfgen generated="true"?>
     
-	<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+	<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.timing.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLTimingDiagram"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2,19,20,11,28,12,13,9,39,15,16,18,17,67,24,25,26,27,40,69"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="3,4,41,44,47,50,53"/>

-      </viewProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLTimingDiagram"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2,19,20,11,28,12,13,9,39,15,16,18,17,67,24,25,26,27,40,69"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="3,4,41,44,47,50,53"/>
+      </viewProvider>
+   </extension>
 
    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
@@ -181,461 +181,444 @@
    </extension>
    
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLIconProvider">

-         <Priority name="Lowest"/>

-      </IconProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLIconProvider">
+         <Priority name="Lowest"/>
+      </IconProvider>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.timing.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.Package_1"

-               name="%metatype.name.Package_1"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.Interaction_2"

-               name="%metatype.name.Interaction_2"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Interaction"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.InteractionEditHelper">

-            <param name="semanticHint" value="2"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_19"

-               name="%metatype.name.Lifeline_19"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullLifelineEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>

-            <param name="semanticHint" value="19"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_20"

-               name="%metatype.name.Lifeline_20"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactLifelineEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>

-            <param name="semanticHint" value="20"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"

-               name="%metatype.name.StateInvariant_11"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="StateInvariant"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullStateInvariantEditHelper">

-            <param name="semanticHint" value="11"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.CompactStateInvariant_28"

-               name="%metatype.name.StateInvariant_28"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactStateInvariantEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"/>

-            <param name="semanticHint" value="28"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_12"

-               name="%metatype.name.OccurrenceSpecification_12"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="OccurrenceSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.OccurrenceSpecificationEditHelper">

-            <param name="semanticHint" value="12"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_13"

-               name="%metatype.name.MessageOccurrenceSpecification_13"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="MessageOccurrenceSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageOccurrenceSpecificationEditHelper">

-            <param name="semanticHint" value="13"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.timing.Node_9"

-            name="%metatype.name.Node_9"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="9"/>

-      </specializationType>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.timing.Node_39"

-            name="%metatype.name.Node_39"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="39"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_15"

-               name="%metatype.name.TimeConstraint_15"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeConstraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeConstraintEditHelper">

-            <param name="semanticHint" value="15"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_16"

-               name="%metatype.name.TimeObservation_16"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="TimeObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeObservationEditHelper">

-            <param name="semanticHint" value="16"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_18"

-               name="%metatype.name.DurationConstraint_18"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationConstraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationConstraintEditHelper">

-            <param name="semanticHint" value="18"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_17"

-               name="%metatype.name.DurationObservation_17"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DurationObservation"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationObservationEditHelper">

-            <param name="semanticHint" value="17"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_67"

-               name="%metatype.name.GeneralOrdering_67"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="GeneralOrdering"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GeneralOrderingEditHelper">

-            <param name="semanticHint" value="67"/>

-         </metamodelType>

-      </metamodel>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.timing.Node_24"

-            name="%metatype.name.Node_24"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="24"/>

-      </specializationType>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.timing.Node_25"

-            name="%metatype.name.Node_25"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="25"/>

-      </specializationType>

-      <specializationType

-            id="org.eclipse.papyrus.uml.diagram.timing.Node_26"

-            name="%metatype.name.Node_26"

-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-         <param name="semanticHint" value="26"/>

-      </specializationType>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_27"

-               name="%metatype.name.DestructionOccurrenceSpecification_27"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="DestructionOccurrenceSpecification"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DestructionOccurrenceSpecificationEditHelper">

-            <param name="semanticHint" value="27"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"

-               name="%metatype.name.Lifeline_40"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Lifeline"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.LifelineEditHelper">

-            <param name="semanticHint" value="40"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.Gate_69"

-               name="%metatype.name.Gate_69"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Gate"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GateEditHelper">

-            <param name="semanticHint" value="69"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"

-               name="%metatype.name.Message_3"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Message"

-               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageSyncEditHelper">

-            <param name="semanticHint" value="3"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageAsync_4"

-               name="%metatype.name.Message_4"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageAsyncEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="4"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageReply_41"

-               name="%metatype.name.Message_41"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageReplyEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="41"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageCreate_44"

-               name="%metatype.name.Message_44"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageCreateEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="44"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageDelete_47"

-               name="%metatype.name.Message_47"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageDeleteEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="47"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageLost_50"

-               name="%metatype.name.Message_50"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageLostEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="50"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

-               id="org.eclipse.papyrus.uml.diagram.timing.MessageFound_53"

-               name="%metatype.name.Message_53"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageFoundEditHelper">

-            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-            <param name="semanticHint" value="53"/>

-         </specializationType>

-      </metamodel>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.Package_1"
+               name="%metatype.name.Package_1"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.Interaction_2"
+               name="%metatype.name.Interaction_2"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Interaction"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.InteractionEditHelper">
+            <param name="semanticHint" value="2"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_19"
+               name="%metatype.name.Lifeline_19"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullLifelineEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>
+            <param name="semanticHint" value="19"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_20"
+               name="%metatype.name.Lifeline_20"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactLifelineEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>
+            <param name="semanticHint" value="20"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"
+               name="%metatype.name.StateInvariant_11"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="StateInvariant"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.FullStateInvariantEditHelper">
+            <param name="semanticHint" value="11"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.CompactStateInvariant_28"
+               name="%metatype.name.StateInvariant_28"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.CompactStateInvariantEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"/>
+            <param name="semanticHint" value="28"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_12"
+               name="%metatype.name.OccurrenceSpecification_12"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="OccurrenceSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.OccurrenceSpecificationEditHelper">
+            <param name="semanticHint" value="12"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_13"
+               name="%metatype.name.MessageOccurrenceSpecification_13"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="MessageOccurrenceSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageOccurrenceSpecificationEditHelper">
+            <param name="semanticHint" value="13"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.timing.Node_9"
+            name="%metatype.name.Node_9"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="9"/>
+      </specializationType>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.timing.Node_39"
+            name="%metatype.name.Node_39"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="39"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_15"
+               name="%metatype.name.TimeConstraint_15"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeConstraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeConstraintEditHelper">
+            <param name="semanticHint" value="15"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_16"
+               name="%metatype.name.TimeObservation_16"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="TimeObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.TimeObservationEditHelper">
+            <param name="semanticHint" value="16"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_18"
+               name="%metatype.name.DurationConstraint_18"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationConstraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationConstraintEditHelper">
+            <param name="semanticHint" value="18"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_17"
+               name="%metatype.name.DurationObservation_17"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DurationObservation"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DurationObservationEditHelper">
+            <param name="semanticHint" value="17"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_67"
+               name="%metatype.name.GeneralOrdering_67"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="GeneralOrdering"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GeneralOrderingEditHelper">
+            <param name="semanticHint" value="67"/>
+         </metamodelType>
+      </metamodel>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.timing.Node_24"
+            name="%metatype.name.Node_24"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="24"/>
+      </specializationType>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.timing.Node_25"
+            name="%metatype.name.Node_25"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="25"/>
+      </specializationType>
+      <specializationType
+            id="org.eclipse.papyrus.uml.diagram.timing.Node_26"
+            name="%metatype.name.Node_26"
+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+         <param name="semanticHint" value="26"/>
+      </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_27"
+               name="%metatype.name.DestructionOccurrenceSpecification_27"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="DestructionOccurrenceSpecification"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.DestructionOccurrenceSpecificationEditHelper">
+            <param name="semanticHint" value="27"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"
+               name="%metatype.name.Lifeline_40"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Lifeline"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.LifelineEditHelper">
+            <param name="semanticHint" value="40"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.Gate_69"
+               name="%metatype.name.Gate_69"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Gate"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.GateEditHelper">
+            <param name="semanticHint" value="69"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"
+               name="%metatype.name.Message_3"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Message"
+               edithelper="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageSyncEditHelper">
+            <param name="semanticHint" value="3"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageAsync_4"
+               name="%metatype.name.Message_4"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageAsyncEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="4"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageReply_41"
+               name="%metatype.name.Message_41"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageReplyEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="41"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageCreate_44"
+               name="%metatype.name.Message_44"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageCreateEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="44"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageDelete_47"
+               name="%metatype.name.Message_47"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageDeleteEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="47"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageLost_50"
+               name="%metatype.name.Message_50"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageLostEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="50"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.timing.MessageFound_53"
+               name="%metatype.name.Message_53"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               edithelperadvice="org.eclipse.papyrus.uml.diagram.timing.edit.helpers.MessageFoundEditHelper">
+            <specializes id="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+            <param name="semanticHint" value="53"/>
+         </specializationType>
+      </metamodel>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

-      <?gmfgen generated="true"?>

-      <clientContext id="org.eclipse.papyrus.uml.diagram.timing.TypeContext">

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.timing.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.timing.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Package_1"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Interaction_2"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_19"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_20"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.CompactStateInvariant_28"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_12"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_13"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_9"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_39"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_15"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_16"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_18"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_17"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_67"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_24"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_25"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_26"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_27"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Gate_69"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageAsync_4"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageReply_41"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageCreate_44"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageDelete_47"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageLost_50"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageFound_53"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

-	   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

-      <?gmfgen generated="true"?>

-      <propertyTester

-            id="org.eclipse.papyrus.uml.diagram.timing.URIEditorInputPropertyTester"

-            type="org.eclipse.emf.common.ui.URIEditorInput"

-            namespace="org.eclipse.papyrus.uml.diagram.timing"

-            properties="isURIEditorInput"

-            class="org.eclipse.papyrus.uml.diagram.timing.part.UMLUriEditorInputTester">

-      </propertyTester>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.timing.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.timing.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.timing.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Package_1"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Interaction_2"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_19"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_20"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.FullStateInvariant_11"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.CompactStateInvariant_28"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecification_12"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageOccurrenceSpecification_13"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_9"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_39"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeConstraint_15"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.TimeObservation_16"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationConstraint_18"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DurationObservation_17"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.GeneralOrdering_67"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_24"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_25"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Node_26"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.DestructionOccurrenceSpecification_27"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Lifeline_40"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.Gate_69"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageSync_3"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageAsync_4"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageReply_41"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageCreate_44"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageDelete_47"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageLost_50"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.timing.MessageFound_53"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
+	   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+      <propertyTester
+            id="org.eclipse.papyrus.uml.diagram.timing.URIEditorInputPropertyTester"
+            type="org.eclipse.emf.common.ui.URIEditorInput"
+            namespace="org.eclipse.papyrus.uml.diagram.timing"
+            properties="isURIEditorInput"
+            class="org.eclipse.papyrus.uml.diagram.timing.part.UMLUriEditorInputTester">
+      </propertyTester>
+   </extension>
 
-   <extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

-      <?gmfgen generated="true"?>

-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.resourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.domainResourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.navigatorLinkHelper"/>

-         </includes>

-      </viewerContentBinding>

-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.timing.navigatorActionProvider"/>

-         </includes>

-      </viewerActionBinding>

-   </extension>

+   <extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.resourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.domainResourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.timing.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.timing.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
 
-   <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

-      <?gmfgen generated="true"?>

-      <navigatorContent

-            id="org.eclipse.papyrus.uml.diagram.timing.resourceContent" 

-            name="%navigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming_diagram"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </possibleChildren>

-         <commonSorter 

-               id="org.eclipse.papyrus.uml.diagram.timing.navigatorSorter" 

-               class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorSorter">

-            <parentExpression>

-               <or>

-                  <and>

-                     <instanceof value="org.eclipse.core.resources.IFile"/>

-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming_diagram"/>

-                  </and>

-                  <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-               </or>

-            </parentExpression>

-         </commonSorter>

-      </navigatorContent>

-      <navigatorContent

-            id="org.eclipse.papyrus.uml.diagram.timing.domainResourceContent" 

-            name="%domainNavigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorItem"/>

-         </possibleChildren>

-      </navigatorContent>

-      <actionProvider

-            id="org.eclipse.papyrus.uml.diagram.timing.navigatorActionProvider"

-            class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorActionProvider">

-         <enablement>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </enablement>

-      </actionProvider>

-   </extension>

+   <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.timing.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming_diagram"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="org.eclipse.papyrus.uml.diagram.timing.navigatorSorter" 
+               class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorSorter">
+            <parentExpression>
+               <or>
+                  <and>
+                     <instanceof value="org.eclipse.core.resources.IFile"/>
+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming_diagram"/>
+                  </and>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.timing.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLTiming"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="org.eclipse.papyrus.uml.diagram.timing.navigatorActionProvider"
+            class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
    
-   <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

-      <?gmfgen generated="true"?>

-      <linkHelper

-            id="org.eclipse.papyrus.uml.diagram.timing.navigatorLinkHelper"

-            class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorLinkHelper">

-         <editorInputEnablement>

-            <and>

-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

-               <test property="org.eclipse.papyrus.uml.diagram.timing.isURIEditorInput"/>

-            </and>

-         </editorInputEnablement>

-         <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>

-         </selectionEnablement>

-      </linkHelper>

-   </extension>

-   <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

-         id="org.eclipse.papyrus.uml.diagram.timing.updateDiagram"

-         name="%update.diagram.name"/>

-   </extension>

+   <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="org.eclipse.papyrus.uml.diagram.timing.navigatorLinkHelper"
+            class="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="org.eclipse.papyrus.uml.diagram.timing.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.timing.navigator.UMLAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.timing.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.timing.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

 
 
 
@@ -908,13 +891,13 @@
 	</extension>
 
 
-<extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-   </extension>

+<extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+   </extension>
 <extension
 			id="Papyrus Timing Diagram .palettedefinition"
 			name="Papyrus Timing Diagram  Predefined Entries"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 0e9eb3bda7b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.timing.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index d25419428f8..818ae72859c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -15,15 +15,15 @@
 -->
 <plugin>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.usecase.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.usecase.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
    
 	<extension
          point="org.eclipse.ui.commands">
@@ -59,1022 +59,1005 @@
    
 
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.usecase"

-            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.usecase"
+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.usecase">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.usecase">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.usecase">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-            <input type="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-         </propertySection>

-      </propertySections>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.usecase">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.usecase.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+            <input type="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+         </propertySection>
+      </propertySections>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-      <?gmfgen generated="true"?>

-      <IconProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLIconProvider">

-         <Priority name="Low"/>

-      </IconProvider>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+      <?gmfgen generated="true"?>
+      <IconProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLIconProvider">
+         <Priority name="Low"/>
+      </IconProvider>
+   </extension>
 
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

-      <?gmfgen generated="true"?>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Package_1000"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Package"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageEditHelper">

-            <param name="semanticHint" value="1000"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Actor_2011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Actor"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ActorEditHelper">

-            <param name="semanticHint" value="2011"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Actor_2012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>

-            <param name="semanticHint" value="2012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.UseCase_2013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="UseCase"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UseCaseEditHelper">

-            <param name="semanticHint" value="2013"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.UseCase_2014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>

-            <param name="semanticHint" value="2014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Classifier_2015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Classifier"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.SubjectEditHelper">

-            <param name="semanticHint" value="2015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Package_2016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>

-            <param name="semanticHint" value="2016"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Constraint_2017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>

-            <param name="semanticHint" value="2017"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Comment_2018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"/>

-            <param name="semanticHint" value="2018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.NamedElement_2022"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="NamedElement"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.DefaultNamedElementEditHelper">

-            <param name="semanticHint" value="2022"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-         <metamodelType

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

-               name="%metatype.name.Diagram_2019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Diagram"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ShortCutDiagramEditHelper">

-            <param name="semanticHint" value="2019"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.ExtensionPoint_3007"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="ExtensionPoint"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtensionPointEditHelper">

-            <param name="semanticHint" value="3007"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ExtensionPoint_3008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/>

-            <param name="semanticHint" value="3008"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.UseCase_3009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>

-            <param name="semanticHint" value="3009"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Component_3016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>

-            <param name="semanticHint" value="3016"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Comment_3015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Comment"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.CommentEditHelper">

-            <param name="semanticHint" value="3015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Constraint_3017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Constraint"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ConstraintEditHelper">

-            <param name="semanticHint" value="3017"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Actor_3018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>

-            <param name="semanticHint" value="3018"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Constraint_3010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>

-            <param name="semanticHint" value="3010"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Actor_3011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>

-            <param name="semanticHint" value="3011"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.UseCase_3012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>

-            <param name="semanticHint" value="3012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Component_3013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>

-            <param name="semanticHint" value="3013"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.Package_3014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>

-            <param name="semanticHint" value="3014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Include_4008"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Include"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.IncludeEditHelper">

-            <param name="semanticHint" value="4008"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Extend_4009"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Extend"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtendEditHelper">

-            <param name="semanticHint" value="4009"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Generalization_4010"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Generalization"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.GeneralizationEditHelper">

-            <param name="semanticHint" value="4010"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Association_4011"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Association"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AssociationEditHelper">

-            <param name="semanticHint" value="4011"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.ConstraintConstrainedElement_4012"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4012"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Dependency_4013"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Dependency"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.DependencyEditHelper">

-            <param name="semanticHint" value="4013"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <specializationType

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

-               name="%metatype.name.CommentAnnotatedElement_4014"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

-            <param name="semanticHint" value="4014"/>

-         </specializationType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Abstraction_4015"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Abstraction"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AbstractionEditHelper">

-            <param name="semanticHint" value="4015"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Usage_4016"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Usage"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UsageEditHelper">

-            <param name="semanticHint" value="4016"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.Realization_4017"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="Realization"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.RealizationEditHelper">

-            <param name="semanticHint" value="4017"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PackageMerge_4018"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PackageMerge"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageMergeEditHelper">

-            <param name="semanticHint" value="4018"/>

-         </metamodelType>

-      </metamodel>

-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-         <metamodelType

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

-               name="%metatype.name.PackageImport_4019"

-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

-               eclass="PackageImport"

-               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageImportEditHelper">

-            <param name="semanticHint" value="4019"/>

-         </metamodelType>

-      </metamodel>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+      <?gmfgen generated="true"?>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"
+               name="%metatype.name.Package_1000"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Package"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageEditHelper">
+            <param name="semanticHint" value="1000"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"
+               name="%metatype.name.Actor_2011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Actor"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ActorEditHelper">
+            <param name="semanticHint" value="2011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"
+               name="%metatype.name.Actor_2012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>
+            <param name="semanticHint" value="2012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"
+               name="%metatype.name.UseCase_2013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="UseCase"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UseCaseEditHelper">
+            <param name="semanticHint" value="2013"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"
+               name="%metatype.name.UseCase_2014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
+            <param name="semanticHint" value="2014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"
+               name="%metatype.name.Classifier_2015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Classifier"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.SubjectEditHelper">
+            <param name="semanticHint" value="2015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"
+               name="%metatype.name.Package_2016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>
+            <param name="semanticHint" value="2016"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"
+               name="%metatype.name.Constraint_2017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>
+            <param name="semanticHint" value="2017"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"
+               name="%metatype.name.Comment_2018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"/>
+            <param name="semanticHint" value="2018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"
+               name="%metatype.name.NamedElement_2022"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="NamedElement"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.DefaultNamedElementEditHelper">
+            <param name="semanticHint" value="2022"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"
+               name="%metatype.name.Diagram_2019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Diagram"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ShortCutDiagramEditHelper">
+            <param name="semanticHint" value="2019"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"
+               name="%metatype.name.ExtensionPoint_3007"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="ExtensionPoint"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtensionPointEditHelper">
+            <param name="semanticHint" value="3007"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"
+               name="%metatype.name.ExtensionPoint_3008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/>
+            <param name="semanticHint" value="3008"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"
+               name="%metatype.name.UseCase_3009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
+            <param name="semanticHint" value="3009"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"
+               name="%metatype.name.Component_3016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
+            <param name="semanticHint" value="3016"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"
+               name="%metatype.name.Comment_3015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Comment"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.CommentEditHelper">
+            <param name="semanticHint" value="3015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"
+               name="%metatype.name.Constraint_3017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Constraint"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ConstraintEditHelper">
+            <param name="semanticHint" value="3017"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"
+               name="%metatype.name.Actor_3018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>
+            <param name="semanticHint" value="3018"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"
+               name="%metatype.name.Constraint_3010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>
+            <param name="semanticHint" value="3010"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"
+               name="%metatype.name.Actor_3011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>
+            <param name="semanticHint" value="3011"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"
+               name="%metatype.name.UseCase_3012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
+            <param name="semanticHint" value="3012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"
+               name="%metatype.name.Component_3013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
+            <param name="semanticHint" value="3013"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"
+               name="%metatype.name.Package_3014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>
+            <param name="semanticHint" value="3014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Include_4008"
+               name="%metatype.name.Include_4008"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Include"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.IncludeEditHelper">
+            <param name="semanticHint" value="4008"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009"
+               name="%metatype.name.Extend_4009"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Extend"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.ExtendEditHelper">
+            <param name="semanticHint" value="4009"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010"
+               name="%metatype.name.Generalization_4010"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Generalization"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.GeneralizationEditHelper">
+            <param name="semanticHint" value="4010"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"
+               name="%metatype.name.Association_4011"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Association"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AssociationEditHelper">
+            <param name="semanticHint" value="4011"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"
+               name="%metatype.name.ConstraintConstrainedElement_4012"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4012"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"
+               name="%metatype.name.Dependency_4013"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Dependency"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.DependencyEditHelper">
+            <param name="semanticHint" value="4013"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <specializationType
+               id="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014"
+               name="%metatype.name.CommentAnnotatedElement_4014"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
+            <param name="semanticHint" value="4014"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015"
+               name="%metatype.name.Abstraction_4015"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Abstraction"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.AbstractionEditHelper">
+            <param name="semanticHint" value="4015"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016"
+               name="%metatype.name.Usage_4016"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Usage"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.UsageEditHelper">
+            <param name="semanticHint" value="4016"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017"
+               name="%metatype.name.Realization_4017"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Realization"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.RealizationEditHelper">
+            <param name="semanticHint" value="4017"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018"
+               name="%metatype.name.PackageMerge_4018"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PackageMerge"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageMergeEditHelper">
+            <param name="semanticHint" value="4018"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019"
+               name="%metatype.name.PackageImport_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="PackageImport"
+               edithelper="org.eclipse.papyrus.uml.diagram.usecase.edit.helpers.PackageImportEditHelper">
+            <param name="semanticHint" value="4019"/>
+         </metamodelType>
+      </metamodel>
+   </extension>
 
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

-      <?gmfgen generated="true"?>

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

-         <enablement>

-            <test

-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

-               value="org.eclipse.papyrus.uml.diagram.usecase.EditingDomain"/>

-         </enablement>

-      </clientContext> 

-      <binding context="org.eclipse.papyrus.uml.diagram.usecase.TypeContext">

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Include_4008"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018"/>

-         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019"/>

-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

-      </binding>

-   </extension>

+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+      <?gmfgen generated="true"?>
+      <clientContext id="org.eclipse.papyrus.uml.diagram.usecase.TypeContext">
+         <enablement>
+            <test
+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+               value="org.eclipse.papyrus.uml.diagram.usecase.EditingDomain"/>
+         </enablement>
+      </clientContext> 
+      <binding context="org.eclipse.papyrus.uml.diagram.usecase.TypeContext">
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Include_4008"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019"/>
+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+      </binding>
+   </extension>
 	   
 	   
 	   
       
-	      <extension point="org.eclipse.ui.commands" id="update-cmd">

-      <?gmfgen generated="true"?>

-      <command

-         categoryId="org.eclipse.ui.category.edit"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramUpdateCommand"

-         description="%update.diagram.description"

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

-         name="%update.diagram.name"/>

-   </extension>

    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

-      <?gmfgen generated="true"?>

-      <key 

-         commandId="org.eclipse.papyrus.uml.diagram.usecase.updateDiagram"

-         contextId="org.eclipse.papyrus.uml.diagram.usecase.ui.diagramContext"

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

-         sequence="F5"/>

-   </extension>

-  <extension point="org.eclipse.core.runtime.preferences" id="prefs">

-      <?gmfgen generated="true"?>

-      <initializer class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPreferenceInitializer"/>

-   </extension>

+  <extension point="org.eclipse.core.runtime.preferences" id="prefs">
+      <?gmfgen generated="true"?>
+      <initializer class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPreferenceInitializer"/>
+   </extension>
 
 
-<extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.usecase.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

+<extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.usecase.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
 
-<extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.usecase.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.part.LoadResourceAction"/>

-   </extension>

+<extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.usecase.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.usecase.part.LoadResourceAction"/>
+   </extension>
 
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-      <?gmfgen generated="true"?>

-<page

-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"

-      name="UseCase Diagram"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramGeneralPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPrintingPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"

-      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPrintingPreferencePage">

-</page>

-<page

-      id="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage"

-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"

-      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage">

-</page>

-   </extension>

+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+      <?gmfgen generated="true"?>
+<page
+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
+      name="UseCase Diagram"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramGeneralPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPrintingPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
+      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramPrintingPreferencePage">
+</page>
+<page
+      id="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage"
+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.UseCase"
+      class="org.eclipse.papyrus.uml.diagram.usecase.preferences.DiagramRulersAndGridPreferencePage">
+</page>
+   </extension>
 
-<extension

-			id="Papyrus useCase editor Plugin.palettedefinition"

-			name="Papyrus useCase editor Plugin Predefined Entries"

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

-			

-			<?gmfgen generated="true"?>	

-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-				<Priority name="Lowest"/>

-				   		<contribution

-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">

-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-				

-				<entry

-				      defineOnly="true"

-				      description="Create Package"

-				      id="usecase.tool.package"

-				      kind="tool"

-				      label="Package"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Subject"

-				      id="usecase.tool.subject"

-				      kind="tool"

-				      label="Subject"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Actor"

-				      id="usecase.tool.actor"

-				      kind="tool"

-				      label="Actor"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Use Case"

-				      id="usecase.tool.usecase"

-				      kind="tool"

-				      label="Use Case"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Constraint"

-				      id="usecase.tool.constraint"

-				      kind="tool"

-				      label="Constraint"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Comment"

-				      id="usecase.tool.comment"

-				      kind="tool"

-				      label="Comment"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Extension Point"

-				      id="usecase.tool.extensionpoint"

-				      kind="tool"

-				      label="Extension Point"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Association Link"

-				      id="usecase.tool.association"

-				      kind="tool"

-				      label="Association"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Generalization Link"

-				      id="usecase.tool.generalization"

-				      kind="tool"

-				      label="Generalization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Dependency Link"

-				      id="usecase.tool.dependency"

-				      kind="tool"

-				      label="Dependency"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Abstraction Link"

-				      id="usecase.tool.abstraction"

-				      kind="tool"

-				      label="Abstraction"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Realization Link"

-				      id="usecase.tool.realization"

-				      kind="tool"

-				      label="Realization"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Usage Link"

-				      id="usecase.tool.usage"

-				      kind="tool"

-				      label="Usage"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create PackageMerge Link"

-				      id="usecase.tool.packagemerge"

-				      kind="tool"

-				      label="PackageMerge"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create PackageImport Link"

-				      id="usecase.tool.packageimport"

-				      kind="tool"

-				      label="PackageImport"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Include Link"

-				      id="usecase.tool.include"

-				      kind="tool"

-				      label="Include"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Extend"

-				      id="usecase.tool.extend"

-				      kind="tool"

-				      label="Extend"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Constrained Element"

-				      id="usecase.tool.constraintlink"

-				      kind="tool"

-				      label="Constrained Element"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

-					</entry>

-				<entry

-				      defineOnly="true"

-				      description="Create Comment Link"

-				      id="usecase.tool.commentlink"

-				      kind="tool"

-				      label="Comment link"

-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

-				      path=""

-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

-					</entry>

-				

-				</contribution>

-			</paletteProvider>	

-				

-		</extension>

+<extension
+			id="Papyrus useCase editor Plugin.palettedefinition"
+			name="Papyrus useCase editor Plugin Predefined Entries"
+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+			
+			<?gmfgen generated="true"?>	
+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+				<Priority name="Lowest"/>
+				   		<contribution
+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">
+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+				
+				<entry
+				      defineOnly="true"
+				      description="Create Package"
+				      id="usecase.tool.package"
+				      kind="tool"
+				      label="Package"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Subject"
+				      id="usecase.tool.subject"
+				      kind="tool"
+				      label="Subject"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Actor"
+				      id="usecase.tool.actor"
+				      kind="tool"
+				      label="Actor"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Use Case"
+				      id="usecase.tool.usecase"
+				      kind="tool"
+				      label="Use Case"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/UseCase.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Constraint"
+				      id="usecase.tool.constraint"
+				      kind="tool"
+				      label="Constraint"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Comment"
+				      id="usecase.tool.comment"
+				      kind="tool"
+				      label="Comment"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Extension Point"
+				      id="usecase.tool.extensionpoint"
+				      kind="tool"
+				      label="Extension Point"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ExtensionPoint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Association Link"
+				      id="usecase.tool.association"
+				      kind="tool"
+				      label="Association"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Generalization Link"
+				      id="usecase.tool.generalization"
+				      kind="tool"
+				      label="Generalization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Dependency Link"
+				      id="usecase.tool.dependency"
+				      kind="tool"
+				      label="Dependency"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Abstraction Link"
+				      id="usecase.tool.abstraction"
+				      kind="tool"
+				      label="Abstraction"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Realization Link"
+				      id="usecase.tool.realization"
+				      kind="tool"
+				      label="Realization"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Usage Link"
+				      id="usecase.tool.usage"
+				      kind="tool"
+				      label="Usage"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create PackageMerge Link"
+				      id="usecase.tool.packagemerge"
+				      kind="tool"
+				      label="PackageMerge"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageMerge.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create PackageImport Link"
+				      id="usecase.tool.packageimport"
+				      kind="tool"
+				      label="PackageImport"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PackageImport.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Include Link"
+				      id="usecase.tool.include"
+				      kind="tool"
+				      label="Include"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Include.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Extend"
+				      id="usecase.tool.extend"
+				      kind="tool"
+				      label="Extend"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Extend.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Constrained Element"
+				      id="usecase.tool.constraintlink"
+				      kind="tool"
+				      label="Constrained Element"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
+					</entry>
+				<entry
+				      defineOnly="true"
+				      description="Create Comment Link"
+				      id="usecase.tool.commentlink"
+				      kind="tool"
+				      label="Comment link"
+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+				      path=""
+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
+					</entry>
+				
+				</contribution>
+			</paletteProvider>	
+				
+		</extension>
 
-<extension

-	id="Papyrus useCase editor Plugin.standard"

-	name="Papyrus useCase editor Plugin Standard Palette"

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

-	

-	<?gmfgen generated="true"?>	

-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

-		<Priority name="Low"/>

-		   		<contribution

-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">

-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

-		

-		<entry

-		      description="Diagram Nodes"

-		      id="usecase.group.nodes"

-		      kind="drawer"

-		      label="Nodes"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="usecase.tool.package"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.subject"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.actor"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.usecase"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.constraint"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.comment"

-		        path="/usecase.group.nodes">

-		  </predefinedEntry>

-		<entry

-		      description="Child Elements of the Diagram Nodes"

-		      id="usecase.group.children"

-		      kind="drawer"

-		      label="Children"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="usecase.tool.extensionpoint"

-		        path="/usecase.group.children">

-		  </predefinedEntry>

-		<entry

-		      description="Diagram Links"

-		      id="usecase.group.links"

-		      kind="drawer"

-		      label="Links"

-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

-		      path="/"

-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

-		      <expand

-		             force="true">

-		      </expand>

-			</entry>

-		<predefinedEntry

-		        id="usecase.tool.association"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.generalization"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.dependency"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.abstraction"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.realization"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.usage"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.packagemerge"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.packageimport"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.include"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.extend"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.constraintlink"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		<predefinedEntry

-		        id="usecase.tool.commentlink"

-		        path="/usecase.group.links">

-		  </predefinedEntry>

-		</contribution>

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

-	</paletteProvider>	

-		

-</extension>

-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.usecase.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

+<extension
+	id="Papyrus useCase editor Plugin.standard"
+	name="Papyrus useCase editor Plugin Standard Palette"
+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
+	
+	<?gmfgen generated="true"?>	
+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
+		<Priority name="Low"/>
+		   		<contribution
+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.usecase.part.UMLPaletteFactory">
+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
+		
+		<entry
+		      description="Diagram Nodes"
+		      id="usecase.group.nodes"
+		      kind="drawer"
+		      label="Nodes"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="usecase.tool.package"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.subject"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.actor"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.usecase"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.constraint"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.comment"
+		        path="/usecase.group.nodes">
+		  </predefinedEntry>
+		<entry
+		      description="Child Elements of the Diagram Nodes"
+		      id="usecase.group.children"
+		      kind="drawer"
+		      label="Children"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="usecase.tool.extensionpoint"
+		        path="/usecase.group.children">
+		  </predefinedEntry>
+		<entry
+		      description="Diagram Links"
+		      id="usecase.group.links"
+		      kind="drawer"
+		      label="Links"
+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
+		      path="/"
+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
+		      <expand
+		             force="true">
+		      </expand>
+			</entry>
+		<predefinedEntry
+		        id="usecase.tool.association"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.generalization"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.dependency"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.abstraction"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.realization"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.usage"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.packagemerge"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.packageimport"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.include"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.extend"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.constraintlink"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		<predefinedEntry
+		        id="usecase.tool.commentlink"
+		        path="/usecase.group.links">
+		  </predefinedEntry>
+		</contribution>
+		<editor id="org.eclipse.papyrus.uml.diagram.usecase"/>
+	</paletteProvider>	
+		
+</extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.usecase.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
 
-<extension id="diagnostic" name="Papyrus useCase editor Plugin problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

+<extension id="diagnostic" name="Papyrus useCase editor Plugin problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
   
   <!-- Custom extension point-->
-<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">

-      <?gmfgen generated="true"?>

-      <propertyTester

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

-            type="org.eclipse.emf.common.ui.URIEditorInput"

-            namespace="org.eclipse.papyrus.uml.diagram.usecase"

-            properties="isURIEditorInput"

-            class="org.eclipse.papyrus.uml.diagram.usecase.part.UMLUriEditorInputTester">

-      </propertyTester>

-   </extension>

+<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
+      <?gmfgen generated="true"?>
+      <propertyTester
+            id="org.eclipse.papyrus.uml.diagram.usecase.URIEditorInputPropertyTester"
+            type="org.eclipse.emf.common.ui.URIEditorInput"
+            namespace="org.eclipse.papyrus.uml.diagram.usecase"
+            properties="isURIEditorInput"
+            class="org.eclipse.papyrus.uml.diagram.usecase.part.UMLUriEditorInputTester">
+      </propertyTester>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">

-      <?gmfgen generated="true"?>

-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.resourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.domainResourceContent"/>

-            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.navigatorLinkHelper"/>

-         </includes>

-      </viewerContentBinding>

-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">

-         <includes>

-            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.navigatorActionProvider"/>

-         </includes>

-      </viewerActionBinding>

-   </extension>

+<extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
+      <?gmfgen generated="true"?>
+      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.resourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.domainResourceContent"/>
+            <contentExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.navigatorLinkHelper"/>
+         </includes>
+      </viewerContentBinding>
+      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
+         <includes>
+            <actionExtension pattern="org.eclipse.papyrus.uml.diagram.usecase.navigatorActionProvider"/>
+         </includes>
+      </viewerActionBinding>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">

-      <?gmfgen generated="true"?>

-      <navigatorContent

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

-            name="%navigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </possibleChildren>

-         <commonSorter 

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

-               class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorSorter">

-            <parentExpression>

-               <or>

-                  <and>

-                     <instanceof value="org.eclipse.core.resources.IFile"/>

-                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>

-                  </and>

-                  <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-               </or>

-            </parentExpression>

-         </commonSorter>

-      </navigatorContent>

-      <navigatorContent

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

-            name="%domainNavigatorContentName" 

-            priority="normal" 

-            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorContentProvider" 

-            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorLabelProvider"

-            icon="icons/obj16/UMLDiagramFile.gif"

-            activeByDefault="true">

-         <triggerPoints>

-            <or>

-               <and>

-                  <instanceof value="org.eclipse.core.resources.IFile"/>

-                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase"/>

-               </and>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

-            </or>

-         </triggerPoints>

-         <possibleChildren>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>

-         </possibleChildren>

-      </navigatorContent>

-      <actionProvider

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

-            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorActionProvider">

-         <enablement>

-            <or>

-               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-            </or>

-         </enablement>

-      </actionProvider>

-   </extension>

+<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
+      <?gmfgen generated="true"?>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.usecase.resourceContent" 
+            name="%navigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </possibleChildren>
+         <commonSorter 
+               id="org.eclipse.papyrus.uml.diagram.usecase.navigatorSorter" 
+               class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorSorter">
+            <parentExpression>
+               <or>
+                  <and>
+                     <instanceof value="org.eclipse.core.resources.IFile"/>
+                     <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase_diagram"/>
+                  </and>
+                  <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+               </or>
+            </parentExpression>
+         </commonSorter>
+      </navigatorContent>
+      <navigatorContent
+            id="org.eclipse.papyrus.uml.diagram.usecase.domainResourceContent" 
+            name="%domainNavigatorContentName" 
+            priority="normal" 
+            contentProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorContentProvider" 
+            labelProvider="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorLabelProvider"
+            icon="icons/obj16/UMLDiagramFile.gif"
+            activeByDefault="true">
+         <triggerPoints>
+            <or>
+               <and>
+                  <instanceof value="org.eclipse.core.resources.IFile"/>
+                  <test property="org.eclipse.core.resources.extension" value="PapyrusUMLUsecase"/>
+               </and>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>
+            </or>
+         </triggerPoints>
+         <possibleChildren>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLDomainNavigatorItem"/>
+         </possibleChildren>
+      </navigatorContent>
+      <actionProvider
+            id="org.eclipse.papyrus.uml.diagram.usecase.navigatorActionProvider"
+            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorActionProvider">
+         <enablement>
+            <or>
+               <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+            </or>
+         </enablement>
+      </actionProvider>
+   </extension>
 
-<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">

-      <?gmfgen generated="true"?>

-      <linkHelper

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

-            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLinkHelper">

-         <editorInputEnablement>

-            <and>

-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>

-               <test property="org.eclipse.papyrus.uml.diagram.usecase.isURIEditorInput"/>

-            </and>

-         </editorInputEnablement>

-         <selectionEnablement>

-            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>

-         </selectionEnablement>

-      </linkHelper>

-   </extension>

+<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
+      <?gmfgen generated="true"?>
+      <linkHelper
+            id="org.eclipse.papyrus.uml.diagram.usecase.navigatorLinkHelper"
+            class="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLNavigatorLinkHelper">
+         <editorInputEnablement>
+            <and>
+               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
+               <test property="org.eclipse.papyrus.uml.diagram.usecase.isURIEditorInput"/>
+            </and>
+         </editorInputEnablement>
+         <selectionEnablement>
+            <instanceof value="org.eclipse.papyrus.uml.diagram.usecase.navigator.UMLAbstractNavigatorItem"/>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
 <extension
       point="org.eclipse.ui.menus">
    <menuContribution
@@ -1304,15 +1287,15 @@
 
 		</diagramMappings>
 	</extension>
-<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-      <?gmfgen generated="true"?>

-      <viewProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLViewProvider">

-         <Priority name="Lowest"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="UseCase"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2012,2013,2014,2015,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019"/>

-      </viewProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+      <?gmfgen generated="true"?>
+      <viewProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLViewProvider">
+         <Priority name="Lowest"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="UseCase"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2011,2012,2013,2014,2015,2016,2017,2018,2022,2019,3007,3008,3009,3016,3015,3017,3018,3010,3011,3012,3013,3014"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019"/>
+      </viewProvider>
+   </extension>
 
 <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
@@ -1336,12 +1319,12 @@
          <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
       </editpartProvider>
    </extension>
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-      <?gmfgen generated="true"?>

-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider">

-         <Priority name="Lowest"/>

-      </ParserProvider>

-   </extension>

+<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+      <?gmfgen generated="true"?>
+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLParserProvider">
+         <Priority name="Lowest"/>
+      </ParserProvider>
+   </extension>
 
 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdateCommand.java
deleted file mode 100644
index 0cdda79b9b3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramUpdateCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**

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

- */

-package org.eclipse.papyrus.uml.diagram.usecase.part;

-

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

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

-import org.eclipse.gef.EditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

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

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @generated

- */

-public class UMLDiagramUpdateCommand implements IHandler {

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void addHandlerListener(IHandlerListener handlerListener) {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;

-			if (structuredSelection.size() != 1) {

-				return null;

-			}

-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {

-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();

-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();

-					nextEditPolicy.refresh();

-				}

-

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isEnabled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public boolean isHandled() {

-		return true;

-	}

-

-	/**

-	 * @generated

-	 */

-	@Override

-	public void removeHandlerListener(IHandlerListener handlerListener) {

-	}

-}