Improve ElementTypeConfiguration Framework to support:

 - Advice execution ordering
 - Prepare Multiple ClientContext in Papyrus

Change-Id: I00b5d3d5e090de1b8fc9926c9073913c90dda47e

89 files changed, 5947 insertions, 2555 deletions

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index 64016035969..794cff7a53d 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -48,6 +48,8 @@ http://www.eclipse.org/legal/epl-v10.html
    <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" install-size="0" unpack="false" version="0.0.0"/>
+   
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.filters" install-size="0" unpack="false" version="0.0.0"/>
 
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java
index ab2398860cc..b41803577ec 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java
+++ b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java
@@ -12,6 +12,10 @@
  *****************************************************************************/

 package org.eclipse.papyrus.elementtypesconfigurations.developer.view;

 

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -22,15 +26,13 @@ import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.Elemen
 import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesDetailsContentProvider;

 import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesDetailsLabelProvider;

 import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesLabelProvider;

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

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.events.MouseAdapter;

-import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Combo;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.dialogs.FilteredTree;

 import org.eclipse.ui.dialogs.PatternFilter;

@@ -38,33 +40,60 @@ import org.eclipse.ui.part.ViewPart;
 

 public class RegistredElementTypesView extends ViewPart {

 

-	IClientContext context = null;

 	FilteredTree detailsFilteredTree = null;

 	SashForm sash = null;

 	FilteredTree elementTypesFilteredTree = null;

+	Combo combo = null;

 

-	public RegistredElementTypesView() {

-		try {

-			context = TypeContext.getContext();

-		} catch (ServiceException e) {

-			e.printStackTrace();

-		}

-	}

 

 	@Override

 	public void createPartControl(Composite parent) {

 		parent.setLayout(new GridLayout(1, true));

-		Button button = new Button(parent, SWT.NONE);

-		button.setText("Refresh");

-		button.addMouseListener(new MouseAdapter() {

+

+		combo = new Combo(parent, SWT.NONE);

+		final List<String> itemsList = new ArrayList<>();

+		List<IClientContext> contexts = new ArrayList<IClientContext>(ClientContextManager.getInstance().getClientContexts());

+

+		int index = -1;

+		int i = 0;

+		for (IClientContext context : contexts) {

+			itemsList.add(context.getId());

+			if (context.getId().equals(ClientContextManager.getDefaultClientContext().getId())) {

+				index = i;

+			}

+			i++;

+		}

+		String[] items = new String[itemsList.size()];

+		items = itemsList.toArray(items);

+		combo.setItems(items);

+		if (index != -1) {

+			combo.select(index);

+		}

+		combo.addSelectionListener(new SelectionListener() {

 

 			@Override

-			public void mouseUp(MouseEvent e) {

-				IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

-				elementTypesFilteredTree.getViewer().setInput(elementTypes);

+			public void widgetSelected(SelectionEvent e) {

+				int index = combo.getSelectionIndex();

+

+				String clientContexId = itemsList.get(index);

+

+				if (clientContexId != null) {

+					IClientContext clientContex = ClientContextManager.getInstance().getClientContext(clientContexId);

+					if (clientContex != null) {

+						IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(clientContex);

+						elementTypesFilteredTree.getViewer().setInput(elementTypes);

+					}

+				}

+

 			}

 

+			@Override

+			public void widgetDefaultSelected(SelectionEvent e) {

+

+

+			}

 		});

+

 		sash = new SashForm(parent, SWT.HORIZONTAL);

 		sash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

 

@@ -75,8 +104,9 @@ public class RegistredElementTypesView extends ViewPart {
 		detailsFilteredTree.getViewer().setLabelProvider(new ElementTypesDetailsLabelProvider());

 		detailsFilteredTree.getViewer().setContentProvider(new ElementTypesDetailsContentProvider());

 

-		IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

-		elementTypesFilteredTree.getViewer().setInput(elementTypes);

+		if (index != -1) {

+			combo.select(index);

+		}

 

 		elementTypesFilteredTree.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/.gitignore b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/.gitignore
new file mode 100644
index 00000000000..1c31bab9945
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/.gitignore
@@ -0,0 +1 @@
+org/
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore
deleted file mode 100644
index d728878be1c..00000000000
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/ElementTypeRegistryGenerator.java
-/.ElementTypeRegistryGenerator.xtendbin
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
index 86dc205719b..5e255acd454 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" name="GMF::Diagram" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="NotationElementTypeSet"

+    identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet"

+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_ScP1oVYCEeS0WsAAtVmToA"

+      name="GMF::Diagram"

+      identifier="org.eclipse.papyrus.gmfdiag.common.Diagram"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index 4ad8e04a92e..4b93cf12922 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -445,7 +445,7 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.infra.gmfdiag.common.elementTypeSet"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/notation.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
index fe99efb8786..a7fc257c26e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
@@ -14,6 +14,7 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.helper;
 
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -36,6 +37,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
 import org.eclipse.papyrus.infra.elementtypesconfiguration.notification.AbstractNotifierEditHelper;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.AdviceComparator;
 import org.eclipse.papyrus.infra.emf.commands.UnsetValueCommand;
 import org.eclipse.papyrus.infra.emf.requests.UnsetRequest;
 import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateEditBasedElementCommand;
@@ -364,6 +366,8 @@ public class DefaultEditHelper extends AbstractNotifierEditHelper {
 				advices = ElementTypeRegistry.getInstance().getEditHelperAdvice(editHelperContext);
 			}
 		}
+		
+		Arrays.sort(advices, new AdviceComparator());
 
 		return advices;
 	}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
index a377822234f..6499e4ab98a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
@@ -5,9 +5,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

     xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="InvariantTypes"

+    identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/invarianttype"

     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

   <adviceBindingsConfigurations

       xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ"

+      name=""

       identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.DefaultInvariantEditHelperAdvice"

       editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.DefaultInvariantEditHelperAdvice"

       inheritance="all">

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
index 87a036a99dd..cb5c01796e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
@@ -54,7 +54,7 @@
    <extension

          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

       <elementTypeSet

-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.elementTypeSet"

+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

             path="model/invarianttype.elementtypesconfigurations">

       </elementTypeSet>

    </extension>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
index cdbc51a19b7..d97bd98d274 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
@@ -1,22 +1,21 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.100.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.advice;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

+ org.eclipse.ui;bundle-version="3.100.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

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

+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.elementtypesconfigurations.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;x-internal:=true,

+ org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.advice;x-internal:=true,

+ org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;x-internal:=true

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/UserElementTypeDefinitionsProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/UserElementTypeDefinitionsProvider.java
deleted file mode 100644
index ddb0c57ed46..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/UserElementTypeDefinitionsProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus 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:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.registries.spi.IUserElementTypeDefinitionsProvider;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences.ElementTypesPreferences;
-
-/**
- * User element-types definitions provider for compatibility with the 1.x releases.
- */
-public class UserElementTypeDefinitionsProvider implements IUserElementTypeDefinitionsProvider {
-
-	public UserElementTypeDefinitionsProvider() {
-		super();
-	}
-
-	@Override
-	public String getElementTypesRedefinition(String elementTypesID) {
-		return ElementTypesPreferences.getElementTypesRedefinition(elementTypesID);
-	}
-
-	@Override
-	public Map<String, String> getLocalElementTypeDefinitions() {
-		return ElementTypesPreferences.getLocalElementTypeDefinitions();
-	}
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
index 158340217a0..af47bcf7fa9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
@@ -1,128 +1,155 @@
-/*****************************************************************************
- * 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.infra.elementtypesconfigurations.internal.ui.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences.ElementTypesPreferences;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.statushandlers.StatusManager;
-
-/**
- * Handler to deploy new configuration
- */
-public class DeployElementTypeSetConfigurationHandler extends AbstractHandler implements IHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
-			return null;
-		}
-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
-		final Shell activeShell = HandlerUtil.getActiveShell(event);
-		Job job = new Job("Deploy elementTypes set configuration") {
-
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask("Deploying selected configurations", selection.size());
-				return doExecute(selection, monitor);
-			}
-		};
-		job.addJobChangeListener(new JobChangeAdapter() {
-
-			@Override
-			public void done(final IJobChangeEvent event) {
-				activeShell.getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						if (event.getResult().isOK()) {
-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
-						}
-					}
-				});
-			}
-		});
-		job.setUser(true);
-		job.schedule();
-		return null;
-	}
-
-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
-		Iterator<?> selectionIterator = selection.iterator();
-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully deployed and activated", null);
-		while (selectionIterator.hasNext()) {
-			Object selectedElement = selectionIterator.next();
-			if (selectedElement instanceof IAdaptable) {
-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
-				if (selectedFile == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
-					continue;
-				}
-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
-				monitor.subTask("Deploy " + fileName);
-				URI emfURI = null;
-				if (selectedFile.getFullPath() != null) {
-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
-				} else if (selectedFile.getRawLocation() != null) {
-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
-				}
-				if (emfURI == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
-					continue;
-				}
-				ElementTypesPreferences.registerWorkspaceDefinition(fileName, selectedFile.getFullPath().toString());
-				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(fileName);
-				monitor.worked(1);
-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been successfully deployed and activated"));
-			}
-		}
-		if (result.getChildren().length == 1) {
-			return result.getChildren()[0];
-		} else { // Merge the result and specify an appropriate message based on the result
-			if (result.isOK()) {
-				return result;
-			} else {
-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());
-				actualResult.merge(result);
-				return actualResult;
-			}
-		}
-	}
-}
+/*****************************************************************************

+ * 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.infra.elementtypesconfigurations.internal.ui.handlers;

+

+import java.util.Iterator;

+

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

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

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

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

+import org.eclipse.core.resources.IFile;

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

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

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

+import org.eclipse.core.runtime.MultiStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.IJobChangeEvent;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.core.runtime.jobs.JobChangeAdapter;

+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

+import org.eclipse.jface.dialogs.MessageDialog;

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

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

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers.ClientContextContentProvider;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.dialogs.ListSelectionDialog;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.eclipse.ui.statushandlers.StatusManager;

+

+/**

+ * Handler to deploy new configuration

+ */

+public class DeployElementTypeSetConfigurationHandler extends AbstractHandler implements IHandler {

+

+	protected IClientContext clientContext;

+

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

+			return null;

+		}

+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

+		final Shell activeShell = HandlerUtil.getActiveShell(event);

+

+		activeShell.getDisplay().syncExec(new Runnable() {

+

+			@Override

+			public void run() {

+				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),

+						"Select the clientContext you want to register the elementtypesconfiguration to");

+				dialog.open();

+				Object[] clientContextSelection = dialog.getResult();

+

+

+

+				if (clientContextSelection != null) {

+					if (clientContextSelection.length > 0) {

+						Object selectedClientContext = clientContextSelection[0];

+						if (selectedClientContext instanceof IClientContext) {

+							clientContext = (IClientContext) selectedClientContext;

+						}

+					}

+				}

+			}

+		});

+

+		if (clientContext == null) {

+			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been loaded"), StatusManager.SHOW);

+		}

+

+		Job job = new Job("Deploy elementTypes set configuration") {

+

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				monitor.beginTask("Deploying selected configurations", selection.size());

+				return doExecute(selection, monitor);

+			}

+		};

+		job.addJobChangeListener(new JobChangeAdapter() {

+

+			@Override

+			public void done(final IJobChangeEvent event) {

+				activeShell.getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						if (event.getResult().isOK()) {

+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

+						}

+					}

+				});

+			}

+		});

+		job.setUser(true);

+		job.schedule();

+		return null;

+	}

+

+

+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

+		Iterator<?> selectionIterator = selection.iterator();

+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully deployed and activated", null);

+		while (selectionIterator.hasNext()) {

+			Object selectedElement = selectionIterator.next();

+			if (selectedElement instanceof IAdaptable) {

+				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);

+				if (selectedFile == null) {

+					monitor.worked(1);

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

+					continue;

+				}

+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

+				monitor.subTask("Deploy " + fileName);

+

+

+

+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(clientContext.getId(), selectedFile.getFullPath().toString());

+

+				monitor.worked(1);

+

+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been loaded"));

+			}

+		}

+		if (result.getChildren().length == 1) {

+			return result.getChildren()[0];

+		} else { // Merge the result and specify an appropriate message based on the result

+			if (result.isOK()) {

+				return result;

+			} else {

+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());

+				actualResult.merge(result);

+				return actualResult;

+			}

+		}

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
index 32fa9b9b75c..0fa15eff03c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
@@ -1,127 +1,174 @@
-/*****************************************************************************
- * 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.infra.elementtypesconfigurations.internal.ui.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences.ElementTypesPreferences;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.statushandlers.StatusManager;
-
-
-public class UndeployElementTypeSetConfigurationHandler extends AbstractHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
-			return null;
-		}
-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
-		final Shell activeShell = HandlerUtil.getActiveShell(event);
-		Job job = new Job("Undeploy elementTypes set configuration") {
-
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask("Undeploying selected configurations", selection.size());
-				return doExecute(selection, monitor);
-			}
-		};
-		job.addJobChangeListener(new JobChangeAdapter() {
-
-			@Override
-			public void done(final IJobChangeEvent event) {
-				activeShell.getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						if (event.getResult().isOK()) {
-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
-						}
-					}
-				});
-			}
-		});
-		job.setUser(true);
-		job.schedule();
-		return null;
-	}
-
-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
-		Iterator<?> selectionIterator = selection.iterator();
-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully undeployed", null);
-		while (selectionIterator.hasNext()) {
-			Object selectedElement = selectionIterator.next();
-			if (selectedElement instanceof IAdaptable) {
-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
-				if (selectedFile == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
-					continue;
-				}
-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
-				monitor.subTask("Deploy " + fileName);
-				URI emfURI = null;
-				if (selectedFile.getFullPath() != null) {
-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
-				} else if (selectedFile.getRawLocation() != null) {
-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
-				}
-				if (emfURI == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
-					continue;
-				}
-				ElementTypesPreferences.unregisterWorkspaceDefinition(fileName);
-				monitor.subTask("Reset elementTypes Registry");
-				ElementTypeSetConfigurationRegistry.getInstance().unload(fileName);
-				monitor.worked(1);
-				// relaunch papyrus service
-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been successfully undeployed"));
-			}
-		}
-		if (result.getChildren().length == 1) {
-			return result.getChildren()[0];
-		} else { // Merge the result and specify an appropriate message based on the result
-			if (result.isOK()) {
-				return result;
-			} else {
-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());
-				actualResult.merge(result);
-				return actualResult;
-			}
-		}
-	}
-}
+/*****************************************************************************

+ * 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.infra.elementtypesconfigurations.internal.ui.handlers;

+

+import java.util.Iterator;

+

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

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

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

+import org.eclipse.core.resources.IFile;

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

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

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

+import org.eclipse.core.runtime.MultiStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.IJobChangeEvent;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.core.runtime.jobs.JobChangeAdapter;

+import org.eclipse.emf.common.util.URI;

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

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

+import org.eclipse.jface.dialogs.MessageDialog;

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

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

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers.ClientContextContentProvider;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.dialogs.ListSelectionDialog;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.eclipse.ui.statushandlers.StatusManager;

+

+

+public class UndeployElementTypeSetConfigurationHandler extends AbstractHandler {

+

+	protected IClientContext clientContext;

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

+			return null;

+		}

+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;

+		final Shell activeShell = HandlerUtil.getActiveShell(event);

+

+		activeShell.getDisplay().syncExec(new Runnable() {

+

+			@Override

+			public void run() {

+				ListSelectionDialog dialog = new ListSelectionDialog(activeShell, ClientContextManager.getInstance().getClientContexts(), new ClientContextContentProvider(), new LabelProvider(),

+						"Select the clientContext you want to register the elementtypesconfiguration to");

+				dialog.open();

+				Object[] clientContextSelection = dialog.getResult();

+

+				if (clientContextSelection != null) {

+					if (clientContextSelection.length > 0) {

+						Object selectedClientContext = clientContextSelection[0];

+						if (selectedClientContext instanceof IClientContext) {

+							clientContext = (IClientContext) selectedClientContext;

+						}

+					}

+				}

+			}

+		});

+

+		if (clientContext == null) {

+			StatusManager.getManager().handle(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The elementTypes configuration has not been undeployed"), StatusManager.SHOW);

+		}

+

+

+		Job job = new Job("Undeploy elementTypes set configuration") {

+

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				monitor.beginTask("Undeploying selected configurations", selection.size());

+				return doExecute(selection, monitor, activeShell);

+			}

+		};

+		job.addJobChangeListener(new JobChangeAdapter() {

+

+			@Override

+			public void done(final IJobChangeEvent event) {

+				activeShell.getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						if (event.getResult().isOK()) {

+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

+						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged

+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

+						}

+					}

+				});

+			}

+		});

+		job.setUser(true);

+		job.schedule();

+		return null;

+	}

+

+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor, Shell shell) {

+		Iterator<?> selectionIterator = selection.iterator();

+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The elementTypes configuration has been successfully undeployed", null);

+		while (selectionIterator.hasNext()) {

+			Object selectedElement = selectionIterator.next();

+			if (selectedElement instanceof IAdaptable) {

+				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);

+				if (selectedFile == null) {

+					monitor.worked(1);

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

+					continue;

+				}

+				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();

+				monitor.subTask("Deploy " + fileName);

+				URI emfURI = null;

+				if (selectedFile.getFullPath() != null) {

+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

+				} else if (selectedFile.getRawLocation() != null) {

+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

+				}

+				if (emfURI == null) {

+					monitor.worked(1);

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

+					continue;

+				}

+				monitor.subTask("Reset elementTypes Registry");

+

+				ResourceSet resourceSet = new ResourceSetImpl();

+				Resource resource = resourceSet.getResource(emfURI, true);

+

+				EObject root = resource.getContents().get(0);

+				if (!(root instanceof ElementTypeSetConfiguration)) {

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));

+					continue;

+				}

+

+				ElementTypeSetConfigurationRegistry.getInstance().unload(clientContext.getId(), ((ElementTypeSetConfiguration) root).getIdentifier());

+

+				monitor.worked(1);

+

+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The elementTypes configuration has been successfully undeployed"));

+			}

+		}

+		if (result.getChildren().length == 1) {

+			return result.getChildren()[0];

+		} else { // Merge the result and specify an appropriate message based on the result

+			if (result.isOK()) {

+				return result;

+			} else {

+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());

+				actualResult.merge(result);

+				return actualResult;

+			}

+		}

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/preferences/ElementTypesPreferences.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/preferences/ElementTypesPreferences.java
deleted file mode 100644
index 4aa3b8d2f3d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/preferences/ElementTypesPreferences.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, 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 LIST - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.LogUtil;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-/**
- * Preferences management for elementTypesConfigurations
- */
-public class ElementTypesPreferences {
-
-	/** id for the preference store for elementTypes redefinitions */
-	public final static String ELEMENT_TYPES_REDEFINITIONS = "elementTypesRedefinitions"; //$NON-NLS-1$
-
-	/** id for the node: elementTypes redefinition */
-	public final static String ELEMENT_TYPES_REDEFINITION = "elementTypesRedefinition"; //$NON-NLS-1$
-
-	public static final String ELEMENT_TYPES_SET_WORKSPACE_DEFINITION = "elementTypeSetsWorkspaceDefinition";
-
-	/** name of the ID attribute */
-	public final static String ID = "id"; //$NON-NLS-1$
-
-	/** name for the field giving the path to the XML file */
-	public final static String PATH = "path"; //$NON-NLS-1$
-
-	private static IPreferenceStore preferences;
-
-	/**
-	 * Returns the preference store used to store elementTypes preferences.
-	 *
-	 * @return the preference store of the plugin
-	 */
-	protected synchronized static IPreferenceStore getPreferenceStore() {
-		if (preferences == null) {
-			preferences = new ScopedPreferenceStore(InstanceScope.INSTANCE,
-					org.eclipse.papyrus.infra.elementtypesconfigurations.Activator.PLUGIN_ID);
-		}
-
-		return preferences;
-	}
-
-	/**
-	 * Retrieves the root memento from the plugin preferences for all elementTypes redefinition
-	 * redefinitions.
-	 *
-	 * @return the root memento if there were existing customizations, a newly created one otherwise (empty one)
-	 */
-	protected static XMLMemento getLocalRedefinitions() {
-		String sValue = getPreferenceStore().getString(ELEMENT_TYPES_REDEFINITIONS);
-		try {
-			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$
-				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));
-				return rootMemento;
-			} else {
-				return XMLMemento.createWriteRoot(ELEMENT_TYPES_REDEFINITIONS);
-			}
-		} catch (WorkbenchException e) {
-			LogUtil.LOG.error("Impossible to read preferences for elementTypes local redefinitions", e);
-		}
-		return null;
-	}
-
-	/**
-	 * Register a new local redefinition of a elementTypes.
-	 *
-	 * @param elementTypesID
-	 *            the id of the elementTypes to register
-	 * @param path
-	 *            the path to the configuration of the elementTypes
-	 * @return the memento that has been registered
-	 */
-	public static IMemento registerLocalRedefinition(String elementTypesID, String path) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// try to find an existing local definition for this elementTypes
-		IMemento memento = getelementTypesRedefinitionNode(elementTypesID);
-		// if one exists, remove it from the preferences
-		if (memento != null) {
-			unregisterLocalRedefinition(elementTypesID);
-		}
-		// then register the new one
-		IMemento newMemento = rootMemento.createChild(ELEMENT_TYPES_REDEFINITION);
-		newMemento.putString(ID, elementTypesID);
-		newMemento.putString(PATH, path);
-		saveLocalRedefinitions(rootMemento);
-		return newMemento;
-	}
-
-	/**
-	 * Returns the memento associated to the elementTypes, or <code>null</code> if none exists
-	 *
-	 * @param elementTypesID
-	 *            the identifier of the elementTypes to find
-	 * @return the memento found or <code>null</code> if no customization exists for this elementTypes
-	 */
-	protected static IMemento getelementTypesRedefinitionNode(String elementTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		IMemento[] redefinitions = rootMemento.getChildren(ELEMENT_TYPES_REDEFINITION);
-		for (IMemento redefinitionMemento : redefinitions) {
-			String elementTypesNodeID = redefinitionMemento.getString(ID);
-			// check equals. elementTypes ID is not null, as checked at the begining of the method.
-			if (elementTypesID.equals(elementTypesNodeID)) {
-				return redefinitionMemento;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the memento associated to the elementTypes set definition in workspace, or <code>null</code> if none exists
-	 *
-	 * @return the memento found or <code>null</code> if no customization exists for this elementTypes
-	 */
-	protected static IMemento[] getWorkspaceDefinitions() {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		IMemento[] workspaceDefinitions = rootMemento.getChildren(ELEMENT_TYPES_SET_WORKSPACE_DEFINITION);
-		return workspaceDefinitions;
-	}
-
-	/**
-	 * Returns the memento associated to the elementTypes set definition in workspace, or <code>null</code> if none exists
-	 *
-	 * @return the memento found or <code>null</code> if no customization exists for this elementTypes
-	 */
-	protected static IMemento getWorkspaceDefinition(String elementTypesetsID) {
-		if (elementTypesetsID == null) {
-			return null;
-		}
-		IMemento[] workspaceDefinitions = getWorkspaceDefinitions();
-		if (workspaceDefinitions == null || workspaceDefinitions.length == 0) {
-			return null;
-		}
-		for (IMemento memento : workspaceDefinitions) {
-			String id = memento.getString(ID);
-			if (elementTypesetsID.equals(id)) {
-				return memento;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the path for a given elementType local redefinition
-	 *
-	 * @param elementTypesID
-	 *            the unique identifier of the elementType to retrieve
-	 * @return the path to the configuration of the elementTypes or <code>null</code> if no customization exists for this elementType
-	 *         configuration
-	 */
-	public static String getElementTypesRedefinition(String elementTypesID) {
-		if (elementTypesID == null) {
-			LogUtil.LOG.debug("Trying to find preferences for a null elementType set identifier");
-		}
-		IMemento memento = getelementTypesRedefinitionNode(elementTypesID);
-		if (memento != null) {
-			return memento.getString(PATH);
-		}
-		return null;
-	}
-
-	/**
-	 * Unregister a specific local redefinition
-	 *
-	 * @param elementTypesID
-	 *            the identifier of the elementTypes set to unregister
-	 */
-	public static void unregisterLocalRedefinition(String elementTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// no remove method...
-		// so, creation of a new root memento, then, duplicate all entries
-		// except the one to
-		// delete...
-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(ELEMENT_TYPES_REDEFINITIONS);
-		for (IMemento memento : rootMemento.getChildren(ELEMENT_TYPES_REDEFINITION)) {
-			if (!memento.getString(ID).equals(elementTypesID)) {
-				newRootMemento.putMemento(memento);
-			}
-		}
-		for (IMemento memento : rootMemento.getChildren(ELEMENT_TYPES_SET_WORKSPACE_DEFINITION)) {
-			newRootMemento.putMemento(memento);
-		}
-		// save new Memento
-		saveLocalRedefinitions(newRootMemento);
-	}
-
-	/**
-	 * @param elementTypesID
-	 */
-	public static void unregisterWorkspaceDefinition(String elementTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// no remove method...
-		// so, creation of a new root memento, then, duplicate all entries
-		// except the one to
-		// delete...
-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(ELEMENT_TYPES_REDEFINITIONS);
-		for (IMemento memento : rootMemento.getChildren(ELEMENT_TYPES_REDEFINITION)) {
-			newRootMemento.putMemento(memento);
-		}
-		for (IMemento memento : rootMemento.getChildren(ELEMENT_TYPES_SET_WORKSPACE_DEFINITION)) {
-			if (!memento.getString(ID).equals(elementTypesID)) {
-				newRootMemento.putMemento(memento);
-			}
-		}
-		// save new Memento
-		saveLocalRedefinitions(newRootMemento);
-	}
-
-	/**
-	 * saves the given root memento with the given key in the preference area
-	 *
-	 * @param xmlMemento
-	 *            the memento to save
-	 * @param key
-	 *            the key for the preference store
-	 */
-	protected static void saveMemento(XMLMemento xmlMemento, String key) {
-		// save memento
-		StringWriter writer = new StringWriter();
-		try {
-			xmlMemento.save(writer);
-			if (getPreferenceStore() != null) {
-				getPreferenceStore().setValue(key, writer.toString());
-			}
-		} catch (IOException e) {
-			LogUtil.LOG.error("input/ouput exception", e);
-		}
-	}
-
-	/**
-	 * Saves the set of local redefinitions into the preference store
-	 *
-	 * @param rootMemento
-	 *            the memento to save
-	 */
-	public static void saveLocalRedefinitions(XMLMemento rootMemento) {
-		saveMemento(rootMemento, ELEMENT_TYPES_REDEFINITIONS);
-	}
-
-	/**
-	 * Returns all the paths in the workspace that should be an elementType set to load, with the id as a key
-	 *
-	 * @return
-	 */
-	public static Map<String, String> getLocalElementTypeDefinitions() {
-		IMemento[] mementos = getWorkspaceDefinitions();
-		if (mementos != null && mementos.length > 0) {
-			Map<String, String> idToPath = new HashMap<String, String>();
-			for (IMemento memento : mementos) {
-				String id = memento.getString(ID);
-				String path = memento.getString(PATH);
-				if (id != null && !"".equals(id) && path != null && !"".equals(PATH)) {
-					idToPath.put(id, path);
-				}
-			}
-			return idToPath;
-		}
-		return null;
-	}
-
-	/**
-	 * Register a new local redefinition of a elementTypes.
-	 *
-	 * @param elementTypesID
-	 *            the id of the elementTypes to register
-	 * @param path
-	 *            the path to the configuration of the elementTypes
-	 * @return the memento that has been registered
-	 */
-	public static IMemento registerWorkspaceDefinition(String elementTypesID, String path) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// try to find an existing local definition for this elementTypes
-		IMemento memento = getWorkspaceDefinition(elementTypesID);
-		// if one exists, remove it from the preferences
-		if (memento != null) {
-			unregisterWorkspaceDefinition(elementTypesID);
-		}
-		// then register the new one
-		IMemento newMemento = rootMemento.createChild(ELEMENT_TYPES_SET_WORKSPACE_DEFINITION);
-		newMemento.putString(ID, elementTypesID);
-		newMemento.putString(PATH, path);
-		saveLocalRedefinitions(rootMemento);
-		return newMemento;
-	}
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/providers/ClientContextContentProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/providers/ClientContextContentProvider.java
new file mode 100644
index 00000000000..292ba0a6588
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/providers/ClientContextContentProvider.java
@@ -0,0 +1,35 @@
+package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

+import org.eclipse.jface.viewers.IStructuredContentProvider;

+import org.eclipse.jface.viewers.Viewer;

+

+public class ClientContextContentProvider implements IStructuredContentProvider {

+

+	@Override

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+

+	}

+

+	@Override

+	public void dispose() {

+	}

+

+	@Override

+	public Object[] getElements(Object inputElement) {

+		List<IClientContext> result = new ArrayList<IClientContext>();

+		if (inputElement instanceof Collection<?>) {

+			for (Object item : (Collection<?>) inputElement) {

+				if (item instanceof IClientContext) {

+					result.add((IClientContext) item);

+				}

+			}

+

+		}

+		return result.toArray();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
index 1e5cfc1cb6b..bbe37ff2b1e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
@@ -11,8 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.elementtypesconfiguration.notification
  org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints,

  org.eclipse.papyrus.infra.elementtypesconfigurations.factories,

  org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.registries.spi;x-friends:="org.eclipse.papyrus.infra.elementtypesconfigurations.ui",

+ org.eclipse.papyrus.infra.elementtypesconfigurations.impl,
  org.eclipse.papyrus.infra.elementtypesconfigurations.registries,

  org.eclipse.papyrus.infra.elementtypesconfigurations.resource,

  org.eclipse.papyrus.infra.elementtypesconfigurations.util,

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
index e9cf63c65ac..b78c58f0df6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
@@ -1,71 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
- Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, 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 LIST - Initial API and implementation
-   Christian W. Damus - bug 485220
--->
-<plugin>
-	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>
-	<extension-point id="elementTypeConfigurationType" name="ElementType Configuration Type" schema="schema/elementTypeConfigurationType.exsd"/>
-	<extension-point id="adviceConfigurationType" name="Advice Configuration Type" schema="schema/adviceConfigurationType.exsd"/>
-	<extension-point id="containerConfigurationType" name="Container Configuration Type" schema="schema/containerConfigurationType.exsd"/>
-	<extension-point id="matcherConfigurationType" name="Matcher Configuration Type" schema="schema/matcherConfigurationType.exsd"/>
-	<extension-point id="userDefinitions" name="User Element Type Definitions" schema="schema/userDefinitions.exsd"/>
-   
-   <extension
-         point="org.eclipse.papyrus.infra.core.service">
-      <service
-            classname="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypesConfigurationsRegistryService"
-            description="Service used to registrer elementTypes in the GMF elementTypes registry"
-            id="ElementTypesConfigurationsRegistryService"
-            priority="50"
-            startKind="startup">
-      </service>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated ElementTypesConfigurations -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage"
-            genModel="model/ElementTypesConfigurations.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.content_parser">
-      <!-- @generated ElementTypesConfigurations -->
-      <parser
-            contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.core.contenttype.contentTypes">
-      <!-- @generated ElementTypesConfigurations -->
-      <content-type
-            base-type="org.eclipse.emf.ecore.xmi"
-            file-extensions="elementtypesconfigurations"
-            id="org.eclipse.papyrus.infra.elementtypesconfigurations"
-            name="%_UI_Elementtypesconfigurations_content_type"
-            priority="normal">
-         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"/>
-            <parameter name="kind" value="xmi"/>
-         </describer>
-      </content-type>
-   </extension>
-
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser
-            type="elementtypesconfigurations"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.resource.CustomElementtypesconfigurationsResourceFactoryImpl"/>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+<!--

+ Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, 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 LIST - Initial API and implementation

+   Christian W. Damus - bug 485220

+-->

+<plugin>

+	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>

+	<extension-point id="elementTypeConfigurationType" name="ElementType Configuration Type" schema="schema/elementTypeConfigurationType.exsd"/>

+	<extension-point id="adviceConfigurationType" name="Advice Configuration Type" schema="schema/adviceConfigurationType.exsd"/>

+	<extension-point id="containerConfigurationType" name="Container Configuration Type" schema="schema/containerConfigurationType.exsd"/>

+	<extension-point id="matcherConfigurationType" name="Matcher Configuration Type" schema="schema/matcherConfigurationType.exsd"/>

+   

+   <extension

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

+      <service

+            classname="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypesConfigurationsRegistryService"

+            description="Service used to registrer elementTypes in the GMF elementTypes registry"

+            id="ElementTypesConfigurationsRegistryService"

+            priority="50"

+            startKind="startup">

+      </service>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated ElementTypesConfigurations -->

+      <package

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage"

+            genModel="model/ElementTypesConfigurations.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.content_parser">

+      <!-- @generated ElementTypesConfigurations -->

+      <parser

+            contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"

+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.core.contenttype.contentTypes">

+      <!-- @generated ElementTypesConfigurations -->

+      <content-type

+            base-type="org.eclipse.emf.ecore.xmi"

+            file-extensions="elementtypesconfigurations"

+            id="org.eclipse.papyrus.infra.elementtypesconfigurations"

+            name="%_UI_Elementtypesconfigurations_content_type"

+            priority="normal">

+         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">

+            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"/>

+            <parameter name="kind" value="xmi"/>

+         </describer>

+      </content-type>

+   </extension>

+

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <parser

+            type="elementtypesconfigurations"

+            class="org.eclipse.papyrus.infra.elementtypesconfigurations.resource.CustomElementtypesconfigurationsResourceFactoryImpl"/>

+   </extension>

+

+</plugin>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd
index ca30dc92aa2..d5a290b5ad3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd
@@ -1,106 +1,106 @@
-<?xml version='1.0' encoding='UTF-8'?>

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

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

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="elementTypeSetConfiguration" name="ElementType Set Configuration"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to registered elementType sets configuration models

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="elementTypeSet"/>

-         </sequence>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

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

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="elementTypeSet">

-      <annotation>

-         <documentation>

-            define a new configuration for an elementType set

-         </documentation>

-      </annotation>

-      <complexType>

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

-            <annotation>

-               <documentation>

-                  The unique identifier of this contribution. To ease debug, it is advised to put the same identifier as the  elementType set configuration identifier.

-               </documentation>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  Path to the model file in the bundle. 

-

-Note: Do not forget to add the file in the binary build of the plugin!

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="resource"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

-         0.10.2

-      </documentation>

-   </annotation>

-

-

-

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010-2013 CEA LIST

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0 which accompanies this distribution, and is available at

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

-Contributors:

-CEA LIST - initial API and implementation

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="elementTypeSetConfiguration" name="ElementType Set Configuration"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to registered elementType sets configuration models
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="elementTypeSet"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="elementTypeSet">
+      <annotation>
+         <documentation>
+            define a new configuration for an elementType set
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="clientContextID" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The unique identifier of the clientContext this elementTypeSet must be registreted to.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="path" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Path to the model file in the bundle. 
+
+Note: Do not forget to add the file in the binary build of the plugin!
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="resource"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.2
+      </documentation>
+   </annotation>
+
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010-2013 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/userDefinitions.exsd b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/userDefinitions.exsd
deleted file mode 100644
index 279049b07c4..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/userDefinitions.exsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="userDefinitions" name="User Element Type Definitions"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-This extension point is used to register providers of user-defined element types.
-&lt;/p&gt;&lt;p&gt;
-&lt;b&gt;Note&lt;/b&gt; that this extension point is intended for internal use within the Papyrus
-element-types framework only.
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="provider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.internal.registries.spi.IUserElementTypeDefinitionsProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.&lt;br/&gt;
-&lt;br/&gt;
-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&lt;br/&gt;
-&lt;br/&gt;
-Contributors:&lt;br/&gt;
-&amp;nbsp;&amp;nbsp;CEA LIST - initial API and implementation&lt;br/&gt;
-&amp;nbsp;&amp;nbsp;Christian W. Damus - bug 485220&lt;br/&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java
index ea0380d60f5..c0461c0515b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java
@@ -22,6 +22,6 @@ public interface IElementTypeSetExtensionPoint {
 	/** attribute: path to the model file in the bundle */
 	public static final String PATH = "path";
 
-	/** attribute: identifier of the contribution */
-	public static final String ID = "id";
+	/** attribute: identifier of the clientContext in which to register the elementTypeConfigurationSet */
+	public static final String CLIENT_CONTEXT_ID = "clientContextID";
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/registries/spi/IUserElementTypeDefinitionsProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/registries/spi/IUserElementTypeDefinitionsProvider.java
deleted file mode 100644
index 992d91601da..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/registries/spi/IUserElementTypeDefinitionsProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, 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 LIST - Initial API and implementation
- *   Christian W. Damus - bug 485220
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.registries.spi;
-
-import java.util.Map;
-
-/**
- * An extension protocol for providers of user-defined element types
- * configuration models.
- */
-public interface IUserElementTypeDefinitionsProvider {
-	/**
-	 * Returns the path for a given elementType local redefinition
-	 *
-	 * @param elementTypesID
-	 *            the unique identifier of the elementType to retrieve
-	 * @return the path to the configuration of the elementTypes or <code>null</code> if no customization exists for this elementType
-	 *         configuration
-	 */
-	String getElementTypesRedefinition(String elementTypesID);
-
-	/**
-	 * Returns all the paths in the workspace that should be an elementType set to load, with the id as a key
-	 *
-	 * @return
-	 */
-	Map<String, String> getLocalElementTypeDefinitions();
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java
index 84c7fe905fb..eadeca81285 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java
@@ -72,7 +72,7 @@ public class AdviceConfigurationTypeRegistry {
 		adviceConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getAdviceBindingConfiguration().getInstanceTypeName(), new AdviceBindingFactory());
 	}
 
-	protected <T extends AdviceConfiguration> IEditHelperAdviceFactory<T> getFactory(AdviceConfiguration adviceConfiguration) {
+	public <T extends AdviceConfiguration> IEditHelperAdviceFactory<T> getFactory(AdviceConfiguration adviceConfiguration) {
 		String adviceConfigurationType = adviceConfiguration.eClass().getInstanceTypeName();
 		// We assume here that the right factory is registered for the right AdviceConfiguration
 		@SuppressWarnings("unchecked")
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
index 3ce66e6e5b8..50f566d0a09 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,7 +8,8 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bugs 459174, 467207, 485220
+ *  Christian W. Damus - bug 459174
+ *  Christian W. Damus - bug 467207
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
@@ -18,19 +19,21 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeUtil;
 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
@@ -39,28 +42,30 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IElementTypeSetExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeCycleUtil;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeConfigurationCycleUtil;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeRegistryUtils;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.OrientedGraph;
 import org.osgi.framework.Bundle;
 
 /**
  * Registry to manage load/unloaded {@link ElementTypeSetConfiguration}.
  */
-@SuppressWarnings("restriction")
 public class ElementTypeSetConfigurationRegistry {
 
-	private static ElementTypeSetConfigurationRegistry elementTypeSetConfigurationRegistry;
+	protected static ElementTypeSetConfigurationRegistry elementTypeSetConfigurationRegistry;
 
 	/** Map of retrieved elementType sets, key is their identifier */
-	protected Map<String, ElementTypeSetConfiguration> elementTypeSetConfigurations = null;
+	protected Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = null;
+
+	protected OrientedGraph<String> advicesDeps = null;
+
 
 	/** unique resource set to load all elementType sets models */
 	protected ResourceSet elementTypeSetConfigurationResourceSet = null;
@@ -84,30 +89,25 @@ public class ElementTypeSetConfigurationRegistry {
 	protected void init() {
 		// 0. Resets values
 		elementTypeSetConfigurationResourceSet = null;
-		elementTypeSetConfigurations = null;
+		elementTypeSetConfigurations = new HashMap<String, Map<String, ElementTypeSetConfiguration>>();
 		// 1. creates the resource set
 		elementTypeSetConfigurationResourceSet = createResourceSet();
-		// 2. creates the list only when registry is acceded for the first time, (or on reload?)
-		elementTypeSetConfigurations = readElementTypeSetConfigurationModels();
-		// load all elementType set
-		Collection<ElementTypeSetConfiguration> values = elementTypeSetConfigurations.values();
-		loadElementTypeSetConfigurations(values);
+		// 2. creates the list only when registry is acceded for the first time,
+		Map<String, Set<ElementTypeSetConfiguration>> elementTypeSetConfigurationsToLoad = readElementTypeSetConfigurationModelsFromExtensionPoints();
+		// Try to load all elementType set definitions
+		for (String contexId : elementTypeSetConfigurationsToLoad.keySet()) {
+			loadElementTypeSetConfigurations(contexId, elementTypeSetConfigurationsToLoad.get(contexId));
+		}
+
 	}
 
 
-	protected Map<String, ElementTypeSetConfiguration> readElementTypeSetConfigurationModels() {
-		Map<String, ElementTypeSetConfiguration> ElementTypeSetConfigurations = new HashMap<String, ElementTypeSetConfiguration>();
-		// 1. retrieve from the workspace
-		Map<String, ElementTypeSetConfiguration> localSets = readElementTypeSetConfigurationModelsFromWorkspace();
-		if (localSets != null && !localSets.isEmpty()) {
-			ElementTypeSetConfigurations.putAll(localSets);
-		}
-		// 2. retrieve from the platform. If already in workspace (id), do not load the platform ones
-		Map<String, ElementTypeSetConfiguration> registeredSets = readElementTypeSetConfigurationModelsFromExtensionPoints(localSets.keySet());
-		if (registeredSets != null && !registeredSets.isEmpty()) {
-			ElementTypeSetConfigurations.putAll(registeredSets);
-		}
-		return ElementTypeSetConfigurations;
+	protected Map<String, Set<ElementTypeSetConfiguration>> readElementTypeSetConfigurationModels() {
+		Map<String, Set<ElementTypeSetConfiguration>> elementTypeSetConfigurations = new HashMap<String, Set<ElementTypeSetConfiguration>>();
+
+
+
+		return elementTypeSetConfigurations;
 	}
 
 	/**
@@ -117,10 +117,12 @@ public class ElementTypeSetConfigurationRegistry {
 		if (elementTypeSetConfigurations == null) {
 			return;
 		}
-		// copy set of entries to iterate and unload them one by one
-		List<Entry<String, ElementTypeSetConfiguration>> entriesToDispose = new ArrayList<Entry<String, ElementTypeSetConfiguration>>(elementTypeSetConfigurations.entrySet());
-		for (Entry<String, ElementTypeSetConfiguration> entry : entriesToDispose) {
-			unload(entry.getKey());
+
+		for (String contextId : elementTypeSetConfigurations.keySet()) {
+			for (String elementTypeSetId : elementTypeSetConfigurations.get(contextId).keySet()) {
+				unload(contextId, elementTypeSetId);
+			}
+
 		}
 		elementTypeSetConfigurationResourceSet = null;
 		elementTypeSetConfigurations = null;
@@ -130,11 +132,16 @@ public class ElementTypeSetConfigurationRegistry {
 	/**
 	 * Loads a given elementType set from a given identifier
 	 */
-	public void loadElementTypeSetConfiguration(String identifier) {
-		// retrieve the path from the identifier
-		String path = UserElementTypeDefinitionsRegistry.getInstance().getLocalElementTypeDefinitions().get(identifier);
+	public boolean loadElementTypeSetConfiguration(String contextId, String path) {
+
 		if (path == null) {
-			return;
+			Activator.log.warn("Path must not be null" + path);
+			return false;
+		}
+
+		if (contextId == null) {
+			Activator.log.warn("contextId must not be null" + path);
+			return false;
 		}
 		URI localURI = URI.createPlatformResourceURI(path, true);
 		Resource resource = elementTypeSetConfigurationResourceSet.createResource(localURI);
@@ -142,27 +149,25 @@ public class ElementTypeSetConfigurationRegistry {
 			resource.load(null);
 			EObject content = resource.getContents().get(0);
 			if (content instanceof ElementTypeSetConfiguration) {
-				elementTypeSetConfigurations.put(identifier, (ElementTypeSetConfiguration) content);
-				loadElementTypeSetConfiguration((ElementTypeSetConfiguration) content);
+				return loadElementTypeSetConfiguration(contextId, (ElementTypeSetConfiguration) content);
 			}
 		} catch (IOException e) {
 			Activator.log.error(e);
 		}
+
+		return false;
+
 	}
 
-	protected void loadElementTypeSetConfiguration(ElementTypeSetConfiguration elementTypeSetConfiguration) {
-		loadElementTypeSetConfigurations(Collections.singleton(elementTypeSetConfiguration));
+	public boolean loadElementTypeSetConfiguration(String clientContextID, ElementTypeSetConfiguration elementTypeSetConfiguration) {
+		return loadElementTypeSetConfigurations(clientContextID, Collections.singleton(elementTypeSetConfiguration));
 	}
 
-	protected List<SpecializationTypeConfiguration> getDependencies(SpecializationTypeConfiguration specializationTypeConfiguration, Map<String, SpecializationTypeConfiguration> specializationTypeConfigurationsToRegister) {
-		List<SpecializationTypeConfiguration> result = new ArrayList<SpecializationTypeConfiguration>();
-		for (String specializedTypeID : specializationTypeConfiguration.getSpecializedTypesID()) {
-			SpecializationTypeConfiguration value = specializationTypeConfigurationsToRegister.get(specializedTypeID);
-			if (value != null) {
-				result.add(value);
-			}
+	public OrientedGraph<String> getAdvicesDeps() {
+		if (advicesDeps == null) {
+			advicesDeps = new OrientedGraph<>();
 		}
-		return result;
+		return advicesDeps;
 	}
 
 	protected boolean isAlreadyRegistred(String elementTypeID, IClientContext context) {
@@ -171,7 +176,7 @@ public class ElementTypeSetConfigurationRegistry {
 				if (ElementTypeRegistryUtils.getType(context, elementTypeID) == null) {
 					// The elementType is already existing but not binded yet
 					context.bindId(elementTypeID);
-					Activator.log.info(elementTypeID + " is already registred elementtype but it is not binded yet. It has beeen binded to Papyrus context. ");
+					Activator.log.info(elementTypeID + " is already registred elementtype but it is not binded yet. It has been binded to Papyrus context. ");
 				}
 			}
 			return true;
@@ -235,39 +240,105 @@ public class ElementTypeSetConfigurationRegistry {
 
 	}
 
-	public void loadElementTypeSetConfigurations(Collection<ElementTypeSetConfiguration> elementTypeSetConfigurations) {
-		Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions = new HashMap<String, ElementTypeConfiguration>();
+	public boolean loadElementTypeSetConfigurations(String contexId, Collection<ElementTypeSetConfiguration> elementTypeSetConfigurationsToRegister) {
 
-		IClientContext context;
-		try {
-			context = TypeContext.getContext();
-		} catch (ServiceException e1) {
-			Activator.log.error(e1);
-			return;
+		if (contexId == null) {
+			Activator.log.warn("contexId must not be null. Loading aborted. ");
+			return false;
 		}
 
+		IClientContext context = ClientContextManager.getInstance().getClientContext(contexId);
+		if (context == null) {
+			Activator.log.warn("contexId couldn't be found. Loading aborted. ");
+			return false;
+		}
+
+		Map<String, ElementTypeConfiguration> elementTypeConfigurationsDefinitions = new HashMap<String, ElementTypeConfiguration>();
+
+
+
 		// Read from elementTypeSetConfigurations
-		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations) {
-			for (ElementTypeConfiguration elementTypeConfiguration : elementTypeSetConfiguration.getElementTypeConfigurations()) {
-				elementTypeConfigurationsDefinitions.put(elementTypeConfiguration.getIdentifier(), elementTypeConfiguration);
+		Set<ElementTypeSetConfiguration> registrableElementTypeSetConfiguration = new HashSet<ElementTypeSetConfiguration>();
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurationsToRegister) {
+			// Check if not already registered
+			if (elementTypeSetConfigurations.containsKey(elementTypeSetConfiguration.getIdentifier())) {
+				Activator.log.warn("The following ElementTypesSetConfiguration has been ignored because the same ID already registreted: " + elementTypeSetConfiguration.getIdentifier());
+			} else {
+				registrableElementTypeSetConfiguration.add(elementTypeSetConfiguration);
+				for (ElementTypeConfiguration elementTypeConfiguration : elementTypeSetConfiguration.getElementTypeConfigurations()) {
+					elementTypeConfigurationsDefinitions.put(elementTypeConfiguration.getIdentifier(), elementTypeConfiguration);
+				}
 			}
 		}
 
-		Collection<Collection<String>> cycles = ElementTypeCycleUtil.getCycles(elementTypeConfigurationsDefinitions.values());
-		if (!cycles.isEmpty()) {
-			Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there are cyclic-dependencies in the ElementTypes definitions: " + cycles);
-			return;
+		// Check there is no cyclic dependencies among elementTypes introduced by this loading
+		HashSet<ElementTypeConfiguration> elementTypesToCheck = new HashSet<ElementTypeConfiguration>();
+		// The old ones already registered
+		if (elementTypeSetConfigurations.containsKey(contexId)) {
+			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
+				elementTypesToCheck.addAll(elementTypeSetConfiguration.getElementTypeConfigurations());
+			}
+		}
+		// The new ones we wan to register
+		elementTypesToCheck.addAll(elementTypeConfigurationsDefinitions.values());
+		OrientedGraph<String> elementTypesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongElementTypes(elementTypesToCheck);
+
+		Collection<Collection<Object>> cyclesElementTypes = ElementTypeConfigurationCycleUtil.getCyclesAmongElementTypes(elementTypesDeps.getVertices(), elementTypesDeps.getEdges());
+		if (!cyclesElementTypes.isEmpty()) {
+			Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependency in the ElementTypes definitions: " + cyclesElementTypes);
+			return false;
 		}
 
+		// Collect all advicesconfiguration
+		HashSet<AdviceConfiguration> adviceToCheck = new HashSet<AdviceConfiguration>();
+		// The old ones already registered
+		if (elementTypeSetConfigurations.containsKey(contexId)) {
+			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
+				TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
+				while (it.hasNext()) {
+					EObject element = (EObject) it.next();
+					if (element instanceof AdviceConfiguration) {
+						adviceToCheck.add((AdviceConfiguration) element);
+					}
+
+				}
+			}
+		}
+		// The new ones we want to register
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
+			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
+			while (it.hasNext()) {
+				EObject element = (EObject) it.next();
+				if (element instanceof AdviceConfiguration) {
+					adviceToCheck.add((AdviceConfiguration) element);
 
-		// ElementTypesConfigurations can be registered
+				}
+			}
+		}
+
+		// Check that there is no cyclic dependencies among advices introduced by this loading
+		advicesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongAdvices(adviceToCheck);
+		Collection<Collection<Object>> cyclesAdvices = ElementTypeConfigurationCycleUtil.getCyclesInAdvices(advicesDeps.getVertices(), advicesDeps.getEdges());
+		if (!cyclesAdvices.isEmpty()) {
+			Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependencies in the Advices definitions: " + cyclesAdvices);
+			return false;
+		}
+
+		// If we reached that point, we should be able to register safely the none already registered elementTypeSets
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
+			if (!elementTypeSetConfigurations.containsKey(contexId)) {
+				elementTypeSetConfigurations.put(contexId, new HashMap<String, ElementTypeSetConfiguration>());
+			}
+			elementTypeSetConfigurations.get(contexId).put(elementTypeSetConfiguration.getIdentifier(), elementTypeSetConfiguration);
+		}
+
+		// New ElementTypesConfigurations can be registered
 		for (ElementTypeConfiguration elementTypeConfiguration : elementTypeConfigurationsDefinitions.values()) {
 			registerElementTypeConfiguration(elementTypeConfiguration, elementTypeConfigurationsDefinitions, context);
 		}
 
-
 		// Register adviceBindings
-		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations) {
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
 			List<AdviceBindingConfiguration> adviceBindingConfigurations = elementTypeSetConfiguration.getAdviceBindingsConfigurations();
 			for (AdviceBindingConfiguration adviceBindingConfiguration : adviceBindingConfigurations) {
 				IAdviceBindingDescriptor editHelperAdviceDecriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(adviceBindingConfiguration);
@@ -275,16 +346,22 @@ public class ElementTypeSetConfigurationRegistry {
 				context.bindId(editHelperAdviceDecriptor.getId());
 			}
 		}
+
+		return true;
 	}
 
 
-	public void unload(String identifier) {
+	public boolean unload(String contextId, String elementTypeSetId) {
 		if (elementTypeSetConfigurations == null) {
-			return;
+			return false;
+		}
+		if (!elementTypeSetConfigurations.containsKey(contextId)) {
+			return false;
 		}
-		ElementTypeSetConfiguration elementTypeSet = elementTypeSetConfigurations.remove(identifier);
+		Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get(contextId);
+		ElementTypeSetConfiguration elementTypeSet = map.remove(elementTypeSetId);
 		if (elementTypeSet == null) {
-			return;
+			return false;
 		}
 
 		// Remove elementTypes
@@ -320,55 +397,77 @@ public class ElementTypeSetConfigurationRegistry {
 				elementTypeSetConfigurationResourceSet.getResources().remove(resource);
 			}
 		}
+
+		// Recompute adviceDependencies
+		HashSet<AdviceConfiguration> advices = new HashSet<AdviceConfiguration>();
+		// The ones still registered
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
+			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
+			while (it.hasNext()) {
+				EObject element = (EObject) it.next();
+				if (element instanceof AdviceConfiguration) {
+					advices.add((AdviceConfiguration) element);
+				}
+
+			}
+		}
+		advicesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongAdvices(advices);
+
+		return true;
 	}
 
 
-	protected Map<String, ElementTypeSetConfiguration> readElementTypeSetConfigurationModelsFromWorkspace() {
-		Map<String, String> localFilesPath = UserElementTypeDefinitionsRegistry.getInstance().getLocalElementTypeDefinitions();
-		Map<String, ElementTypeSetConfiguration> workspaceElementTypeSets = new HashMap<String, ElementTypeSetConfiguration>();
-		if (localFilesPath != null && !localFilesPath.isEmpty()) {
-			for (Entry<String, String> idToPath : localFilesPath.entrySet()) {
-				String filePath = idToPath.getValue();
-				String id = idToPath.getKey();
-				URI localURI = URI.createPlatformResourceURI(filePath, true);
-				Resource resource = elementTypeSetConfigurationResourceSet.createResource(localURI);
-				try {
-					resource.load(null);
-					EObject content = resource.getContents().get(0);
-					if (content instanceof ElementTypeSetConfiguration) {
-						workspaceElementTypeSets.put(id, (ElementTypeSetConfiguration) content);
+
+	protected void addElementTypeSetConfigurationToDefinitions(ElementTypeSetConfiguration set, String clientContextId, Map<String, Set<ElementTypeSetConfiguration>> existingDefinitions) {
+		if (set.getIdentifier() == null) {
+			Activator.log.warn("The following ElementTypesSetConfiguration has ill-defined ID and is therefore ignored: " + set.eResource().getURI());
+		} else {
+			if (set != null) {
+				if (existingDefinitions.get(clientContextId) != null && containsElementTypeSet(existingDefinitions.get(clientContextId), set.getIdentifier())) {
+					Activator.log.warn("The following ElementTypesSetConfiguration has been ignored because the same ID already registreted: " + set.getIdentifier());
+				} else {
+					if (!existingDefinitions.containsKey(clientContextId)) {
+						existingDefinitions.put(clientContextId, new HashSet<ElementTypeSetConfiguration>());
 					}
-				} catch (IOException e) {
-					Activator.log.error(e);
+					existingDefinitions.get(clientContextId).add(set);
 				}
 			}
 		}
-		return workspaceElementTypeSets;
 	}
 
-	protected Map<String, ElementTypeSetConfiguration> readElementTypeSetConfigurationModelsFromExtensionPoints(Set<String> workspaceDefinitions) {
-		Map<String, ElementTypeSetConfiguration> platformElementTypeSets = new HashMap<String, ElementTypeSetConfiguration>();
+	protected Map<String, Set<ElementTypeSetConfiguration>> readElementTypeSetConfigurationModelsFromExtensionPoints() {
+		Map<String, Set<ElementTypeSetConfiguration>> existingDefinitions = new HashMap<>();
 		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IElementTypeSetExtensionPoint.EXTENSION_POINT_ID);
 		// for each element, parses and retrieve the model file. then loads it and returns the root element
 		for (IConfigurationElement element : elements) {
 			String modelPath = element.getAttribute(IElementTypeSetExtensionPoint.PATH);
-			String elementTypeSetId = element.getAttribute(IElementTypeSetExtensionPoint.ID);
+			String clientContextId = element.getAttribute(IElementTypeSetExtensionPoint.CLIENT_CONTEXT_ID);
 			String contributorID = element.getContributor().getName();
 			if (Platform.inDebugMode()) {
 				Activator.log.debug("[Reading extension point]");
 				Activator.log.debug("-  Path to the model: " + modelPath);
+				Activator.log.debug("-  ClientContext the model should be registreted to: " + clientContextId);
 				Activator.log.debug("-  id of the container bundle: " + contributorID);
-				Activator.log.debug("-  id of the elementType set: " + elementTypeSetId);
 			}
-			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(elementTypeSetId, modelPath, contributorID);
-			if (set != null && !workspaceDefinitions.contains(elementTypeSetId)) { // do not add if it is locally redefined
-				if (platformElementTypeSets.containsKey(elementTypeSetId)) {
-					Activator.log.warn("An element type set is already registered with the id : " + elementTypeSetId);
-				}
-				platformElementTypeSets.put(elementTypeSetId, set);
+			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(modelPath, contributorID);
+
+			addElementTypeSetConfigurationToDefinitions(set, clientContextId, existingDefinitions);
+
+		}
+		return existingDefinitions;
+	}
+
+	protected boolean containsElementTypeSet(Set<ElementTypeSetConfiguration> elementTypeSets, String elementTypeSetConfigurationId) {
+		if (elementTypeSets == null) {
+			return false;
+		}
+
+		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSets) {
+			if (elementTypeSetConfiguration.getIdentifier().equals(elementTypeSetConfigurationId)) {
+				return true;
 			}
 		}
-		return platformElementTypeSets;
+		return false;
 	}
 
 	/**
@@ -388,13 +487,8 @@ public class ElementTypeSetConfigurationRegistry {
 	 *            id of the bundle containing the model file
 	 * @return the loaded file or <code>null</code> if some problem occured during loading
 	 */
-	protected ElementTypeSetConfiguration getElementTypeSetConfiguration(String elementTypesID, String modelPath, String bundleId) {
-		// 1. look in preferences.
-		String filePath = UserElementTypeDefinitionsRegistry.getInstance().getElementTypesRedefinition(elementTypesID);
-		if (filePath != null) {
-			getElementTypeSetConfigurationInPluginStateArea(elementTypesID);
-		}
-		// 2. no local redefinition. Load elementType set from plugin definition
+	protected ElementTypeSetConfiguration getElementTypeSetConfiguration(String modelPath, String bundleId) {
+
 		Bundle bundle = Platform.getBundle(bundleId);
 		if (Platform.isFragment(bundle)) {
 			ElementTypeSetConfiguration configuration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
@@ -433,33 +527,6 @@ public class ElementTypeSetConfigurationRegistry {
 	}
 
 	/**
-	 * Retrieves the contribution in the plugin area
-	 *
-	 * @param path
-	 *            the path of the elementType set to load in the plugin area
-	 */
-	protected ElementTypeSetConfiguration getElementTypeSetConfigurationInPluginStateArea(String path) {
-		// read in preferences area
-		IPath resourcePath = Activator.getDefault().getStateLocation().append(path);
-		URI uri = URI.createFileURI(resourcePath.toOSString());
-		if (uri != null && uri.isFile()) {
-			Resource resource = elementTypeSetConfigurationResourceSet.createResource(uri);
-			try {
-				resource.load(null);
-			} catch (IOException e) {
-				return null;
-			}
-			EObject content = resource.getContents().get(0);
-			if (content instanceof ElementTypeSetConfiguration) {
-				return (ElementTypeSetConfiguration) content;
-			}
-			Activator.log.warn("Impossible to cast the object into an ElementTypeSetConfiguration: " + content);
-			return null;
-		}
-		return null;
-	}
-
-	/**
 	 *
 	 * @param modelPath
 	 *            path of the model in the bundle
@@ -487,7 +554,7 @@ public class ElementTypeSetConfigurationRegistry {
 		return set;
 	}
 
-	public Map<String, ElementTypeSetConfiguration> getElementTypeSetConfigurations() {
+	public Map<String, Map<String, ElementTypeSetConfiguration>> getElementTypeSetConfigurations() {
 		return elementTypeSetConfigurations;
 	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/UserElementTypeDefinitionsRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/UserElementTypeDefinitionsRegistry.java
deleted file mode 100644
index c9bb4abee9f..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/UserElementTypeDefinitionsRegistry.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus 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:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Predicate;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IUserElementTypeDefinitionsExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.registries.spi.IUserElementTypeDefinitionsProvider;
-
-/**
- * Registry of {@link IUserElementTypeDefinitionsProvider}s.
- */
-class UserElementTypeDefinitionsRegistry implements IUserElementTypeDefinitionsExtensionPoint, IUserElementTypeDefinitionsProvider {
-
-	private static final UserElementTypeDefinitionsRegistry INSTANCE = new UserElementTypeDefinitionsRegistry();
-
-	// Only should have the one in the UI bundle
-	private final List<IUserElementTypeDefinitionsProvider> providers = new ArrayList<>(1);
-
-	private UserElementTypeDefinitionsRegistry() {
-		super();
-
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
-		for (IConfigurationElement next : elements) {
-			switch (next.getName()) {
-			case E_PROVIDER:
-				try {
-					providers.add(createProvider(next));
-				} catch (ClassCastException e) {
-					Activator.log.error(e);
-				} catch (CoreException e) {
-					Activator.log.log(e.getStatus());
-				}
-				break;
-			}
-		}
-	}
-
-	public static UserElementTypeDefinitionsRegistry getInstance() {
-		return INSTANCE;
-	}
-
-	private IUserElementTypeDefinitionsProvider createProvider(IConfigurationElement config) throws CoreException {
-		Object result = config.createExecutableExtension(A_CLASS);
-
-		if (!(result instanceof IUserElementTypeDefinitionsProvider)) {
-			throw new ClassCastException("Extension does not implement IUserElementTypeDefinitionsProvider interface in contributor " + config.getContributor().getName()); //$NON-NLS-1$
-		}
-
-		return (IUserElementTypeDefinitionsProvider) result;
-	}
-
-	@Override
-	public String getElementTypesRedefinition(String elementTypesID) {
-		switch (providers.size()) {
-		case 0:
-			return null;
-		case 1:
-			return providers.get(0).getElementTypesRedefinition(elementTypesID);
-		default:
-			return providers.stream()
-					.map(p -> p.getElementTypesRedefinition(elementTypesID))
-					.filter(Objects::nonNull)
-					.findFirst()
-					.orElse(null);
-		}
-	}
-
-	@Override
-	public Map<String, String> getLocalElementTypeDefinitions() {
-		switch (providers.size()) {
-		case 0:
-			return Collections.emptyMap();
-		case 1:
-			return providers.get(0).getLocalElementTypeDefinitions();
-		default:
-			return providers.stream()
-					.map(IUserElementTypeDefinitionsProvider::getLocalElementTypeDefinitions)
-					.filter(Objects::nonNull)
-					.filter(((Predicate<? super Map<String, String>>) Map::isEmpty).negate())
-					.reduce(new HashMap<>(), (acc, elem) -> {
-						acc.putAll(elem);
-						return acc;
-					});
-		}
-	}
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/AdviceComparator.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/AdviceComparator.java
new file mode 100644
index 00000000000..74626a3308f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/AdviceComparator.java
@@ -0,0 +1,47 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST 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 LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+

+import java.util.Comparator;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+

+

+public class AdviceComparator implements Comparator<IEditHelperAdvice> {

+

+	OrientedGraph<String> dependencies;

+

+	public AdviceComparator() {

+		this.dependencies = ElementTypeSetConfigurationRegistry.getInstance().getAdvicesDeps();

+	}

+

+	@Override

+	public int compare(IEditHelperAdvice arg0, IEditHelperAdvice arg1) {

+		String arg0Name = arg0.getClass().getName();

+		String arg1Name = arg1.getClass().getName();

+		if (dependencies.getEdges().containsKey(arg0Name)) {

+			if (dependencies.getAllConnex(arg0Name).contains(arg1Name)) {

+				return -1;

+			}

+		}

+		if (dependencies.getEdges().containsKey(arg1Name)) {

+			if (dependencies.getAllConnex(arg1Name).contains(arg0Name)) {

+				return 1;

+			}

+		}

+		return 0;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeConfigurationCycleUtil.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeConfigurationCycleUtil.java
new file mode 100644
index 00000000000..9c25d38f5d3
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeConfigurationCycleUtil.java
@@ -0,0 +1,127 @@
+package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+import java.util.Stack;

+

+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.AdviceConfigurationTypeRegistry;

+

+//Implements Tarjan's strongly connected components algorithm

+public class ElementTypeConfigurationCycleUtil {

+

+

+	protected static Collection<Collection<Object>> computeStronglyConnectedComponents(Set<String> vertices, Map<String, Set<String>> edges) {

+		int index = 0;

+		Map<String, Integer> lowIndex = new HashMap<String, Integer>();

+		Collection<String> visitedVertices = new HashSet<String>();

+		Stack<String> stack = new Stack<String>();

+		Collection<Collection<Object>> stronglyConnnectedComponents = new ArrayList<Collection<Object>>();

+

+		for (String vertex : vertices) {

+			if (!visitedVertices.contains(vertex))

+				dfs(vertex, vertices, edges, stronglyConnnectedComponents, stack, lowIndex, visitedVertices, index);

+		}

+

+		return stronglyConnnectedComponents;

+	}

+

+

+	protected static void dfs(String vertex, Set<String> vertices, Map<String, Set<String>> map, Collection<Collection<Object>> stronglyConnnectedComponents, Stack<String> stack, Map<String, Integer> lowIndex, Collection<String> visitedVertices,

+			int index) {

+		lowIndex.put(vertex, index++);

+		visitedVertices.add(vertex);

+		stack.push(vertex);

+		int minIndex = lowIndex.get(vertex);

+		for (String targetVertex : map.get(vertex)) {

+			if (!visitedVertices.contains(targetVertex))

+				dfs(targetVertex, vertices, map, stronglyConnnectedComponents, stack, lowIndex, visitedVertices, index);

+			if (lowIndex.get(targetVertex) < minIndex)

+				minIndex = lowIndex.get(targetVertex);

+		}

+		if (minIndex < lowIndex.get(vertex)) {

+			lowIndex.put(vertex, minIndex);

+			return;

+		}

+		List<Object> component = new ArrayList<Object>();

+		String memberVertex;

+		do {

+			memberVertex = stack.pop();

+			component.add(memberVertex);

+			lowIndex.put(memberVertex, vertices.size());

+		} while (!memberVertex.equals(vertex));

+

+		if (component.size() > 1) {

+			stronglyConnnectedComponents.add(component);

+		}

+	}

+

+	static public OrientedGraph<String> getDependenciesAmongAdvices(Collection<AdviceConfiguration> adviceConfigurations) {

+		OrientedGraph<String> adviceDependencies = new OrientedGraph<String>();

+		for (AdviceConfiguration adviceConfiguration : adviceConfigurations) {

+			IAdviceBindingDescriptor descriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(adviceConfiguration);

+

+			String currentAdviceConfigurationClassName = descriptor.getEditHelperAdvice().getClass().getName();

+			// Add current to the vertices

+			adviceDependencies.addVertex(currentAdviceConfigurationClassName);

+

+			// Add dependencies vertices

+			for (String after : adviceConfiguration.getAfter()) {

+				if (after == null) {

+					Activator.log.warn("The following AdviceConfiguration has ill-defined after : " + adviceConfiguration);

+					break;

+				}

+				adviceDependencies.addEdge(currentAdviceConfigurationClassName, after);

+			}

+

+			for (String before : adviceConfiguration.getBefore()) {

+				if (before == null) {

+					Activator.log.warn("The following AdviceConfiguration has ill-defined before : " + adviceConfiguration);

+					break;

+				}

+				adviceDependencies.addEdge(before, currentAdviceConfigurationClassName);

+			}

+

+		}

+

+		return adviceDependencies;

+	}

+

+	static public Collection<Collection<Object>> getCyclesInAdvices(Set<String> vertices, Map<String, Set<String>> edges) {

+

+		return computeStronglyConnectedComponents(vertices, edges);

+	}

+

+	static public OrientedGraph<String> getDependenciesAmongElementTypes(Collection<ElementTypeConfiguration> elementTypesConfigurations) {

+		OrientedGraph<String> elementTypeDependencies = new OrientedGraph<String>();

+

+		for (ElementTypeConfiguration elementTypeConfiguration : elementTypesConfigurations) {

+			String currentElementTypeID = elementTypeConfiguration.getIdentifier();

+

+			// Add current to the vertices

+			elementTypeDependencies.addVertex(currentElementTypeID);

+

+			// Add dependencies vertices

+			if (elementTypeConfiguration instanceof SpecializationTypeConfiguration) {

+				for (String specializedTypeID : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID()) {

+					elementTypeDependencies.addEdge(currentElementTypeID, specializedTypeID);

+				}

+			}

+		}

+

+		return elementTypeDependencies;

+	}

+

+	static public Collection<Collection<Object>> getCyclesAmongElementTypes(Set<String> vertices, Map<String, Set<String>> edges) {

+		return computeStronglyConnectedComponents(vertices, edges);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeCycleUtil.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeCycleUtil.java
deleted file mode 100644
index 89c02a5b209..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeCycleUtil.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.Stack;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-

-//Implements Tarjan's strongly connected components algorithm

-public class ElementTypeCycleUtil {

-

-

-	protected static Collection<Collection<String>> computeStronglyConnectedComponents(Set<String> vertices, Map<String, List<String>> edges) {

-		int index = 0;

-		Map<String, Integer> lowIndex = new HashMap<String, Integer>();

-		Collection<String> visitedVertices = new HashSet<String>();

-		Stack<String> stack = new Stack<String>();

-		Collection<Collection<String>> stronglyConnnectedComponents = new ArrayList<Collection<String>>();

-

-		for (String vertex : vertices) {

-			if (!visitedVertices.contains(vertex))

-				dfs(vertex, vertices, edges, stronglyConnnectedComponents, stack, lowIndex, visitedVertices, index);

-		}

-

-		return stronglyConnnectedComponents;

-	}

-

-

-	protected static void dfs(String vertex, Set<String> vertices, Map<String, List<String>> edges, Collection<Collection<String>> stronglyConnnectedComponents, Stack<String> stack, Map<String, Integer> lowIndex, Collection<String> visitedVertices, int index)

-	{

-		lowIndex.put(vertex, index++);

-		visitedVertices.add(vertex);

-		stack.push(vertex);

-		int minIndex = lowIndex.get(vertex);

-		for (String targetVertex : edges.get(vertex))

-		{

-			if (!visitedVertices.contains(targetVertex))

-				dfs(targetVertex, vertices, edges, stronglyConnnectedComponents, stack, lowIndex, visitedVertices, index);

-			if (lowIndex.get(targetVertex) < minIndex)

-				minIndex = lowIndex.get(targetVertex);

-		}

-		if (minIndex < lowIndex.get(vertex))

-		{

-			lowIndex.put(vertex, minIndex);

-			return;

-		}

-		List<String> component = new ArrayList<String>();

-		String memberVertex;

-		do

-		{

-			memberVertex = stack.pop();

-			component.add(memberVertex);

-			lowIndex.put(memberVertex, vertices.size());

-		} while (!memberVertex.equals(vertex));

-

-		if (component.size() > 1) {

-			stronglyConnnectedComponents.add(component);

-		}

-	}

-

-	static public Collection<Collection<String>> getCycles(Collection<ElementTypeConfiguration> elementTypesConfigurations) {

-		Map<String, List<String>> edges = new HashMap<String, List<String>>();

-		Set<String> vertices = new HashSet<String>();

-

-		for (ElementTypeConfiguration elementTypeConfiguration : elementTypesConfigurations) {

-			String currentElementTypeID = elementTypeConfiguration.getIdentifier();

-

-			// Add current to the vertices

-			vertices.add(currentElementTypeID);

-

-			// Add dependencies vertices

-			if (elementTypeConfiguration instanceof SpecializationTypeConfiguration) {

-				for (String specializedTypeID : ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID()) {

-					vertices.add(specializedTypeID);

-					if (edges.get(specializedTypeID) == null) {

-						edges.put(specializedTypeID, new ArrayList<String>());

-					}

-				}

-				edges.put(currentElementTypeID, ((SpecializationTypeConfiguration) elementTypeConfiguration).getSpecializedTypesID());

-			} else {

-				edges.put(currentElementTypeID, Collections.<String> emptyList());

-			}

-		}

-

-		return computeStronglyConnectedComponents(vertices, edges);

-	}

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
index b767cfc9fc8..15678343ae6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
@@ -17,14 +17,13 @@ import java.util.ArrayList;
 import java.util.List;

 

 import org.eclipse.gmf.runtime.emf.type.core.ClientContext;

+import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

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

 import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

 

 public class ElementTypeRegistryUtils {

 

@@ -54,12 +53,13 @@ public class ElementTypeRegistryUtils {
 		}

 	}

 

-	static public List<IElementType> getElementTypesBySemanticHint(String semanticHint) {

+	static public List<IElementType> getElementTypesBySemanticHint(String semanticHint, String contextId) {

 		List<IElementType> matchingElementTypes = new ArrayList<IElementType>();

 

-		IClientContext context;

-		try {

-			context = TypeContext.getContext();

+		IClientContext context = ClientContextManager.getInstance().getClientContext(contextId);

+

+		if (context != null) {

+

 			IElementType[] elementTypes = ElementTypeRegistry.getInstance().getElementTypes(context);

 

 			for (IElementType iElementType : elementTypes) {

@@ -69,12 +69,8 @@ public class ElementTypeRegistryUtils {
 					}

 				}

 			}

-		} catch (ServiceException e1) {

-			Activator.log.error(e1);

 		}

 

-

-

 		return matchingElementTypes;

 	}

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/OrientedGraph.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/OrientedGraph.java
new file mode 100644
index 00000000000..bc4107f3acb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/OrientedGraph.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST 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 LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Map;

+import java.util.Set;

+

+public class OrientedGraph<T extends Object> {

+	private Map<T, Set<T>> graph;

+

+	/**

+	 * @return the vertices

+	 */

+	public Set<T> getVertices() {

+		return graph.keySet();

+	}

+

+	/**

+	 * @return the edges

+	 */

+	public Map<T, Set<T>> getEdges() {

+		return graph;

+	}

+

+	public Set<T> getAllConnex(T element) {

+		Set<T> result = new HashSet<T>();

+

+		Set<T> directChildren = graph.get(element);

+

+		result.addAll(directChildren);

+

+		for (T child : directChildren) {

+			Set<T> childChildren = getAllConnex(child);

+			result.addAll(childChildren);

+		}

+

+		return result;

+	}

+

+

+	public OrientedGraph() {

+		graph = new HashMap<T, Set<T>>();

+	}

+

+	public OrientedGraph(Map<T, Set<T>> edges) {

+		this.graph = edges;

+	}

+

+	public void clear() {

+		graph.clear();

+	}

+

+	public void addEdge(T source, T target) {

+		if (!graph.containsKey(source)) {

+			addVertex(source);

+		}

+		if (!graph.containsKey(target)) {

+			addVertex(target);

+		}

+

+		graph.get(source).add(target);

+	}

+

+	public void addVertex(T vertex) {

+		if (!graph.containsKey(vertex)) {

+			graph.put(vertex, new HashSet<T>());

+		}

+

+	}

+

+	public String toString() {

+		String result = "";

+		for (T element : graph.keySet()) {

+			result += "- " + element + "\n";

+			for (T target : graph.get(element)) {

+				result += "\t-> " + target + "\n";

+			}

+		}

+

+		return result;

+

+	}

+

+}

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
index cea4604e053..5c8364761b1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
@@ -1,36 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities">

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Optional" identifier="org.eclipse.papyrus.sysml.stereotype.Optional" hint="SysML::Stereotype::Optional" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Optional"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_rRIxgLOjEeWH6Y3Wi2YKxg"

+    name="elementTypeSetActivities"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetActivities"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxgbOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Optional"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Optional"

+      hint="SysML::Stereotype::Optional"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Optional"/>

   </elementTypeConfigurations>

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Rate" identifier="org.eclipse.papyrus.sysml.stereotype.Rate" hint="SysML::Stereotype::Rate" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Rate"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxgrOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Rate"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Rate"

+      hint="SysML::Stereotype::Rate"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Rate"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Probability" identifier="org.eclipse.papyrus.sysml.stereotype.Probability" hint="SysML::Stereotype::Probability" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Probability"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxg7OjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Probability"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Probability"

+      hint="SysML::Stereotype::Probability"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Probability"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Continuous" identifier="org.eclipse.papyrus.sysml.stereotype.Continuous" hint="SysML::Stereotype::Continuous" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Continuous"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxhLOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Continuous"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Continuous"

+      hint="SysML::Stereotype::Continuous"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Continuous"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Discrete" identifier="org.eclipse.papyrus.sysml.stereotype.Discrete" hint="SysML::Stereotype::Discrete" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Discrete"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxhbOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Discrete"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Discrete"

+      hint="SysML::Stereotype::Discrete"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Discrete"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::ControlOperator" identifier="org.eclipse.papyrus.sysml.stereotype.ControlOperator" hint="SysML::Stereotype::ControlOperator" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/ControlOperator"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxhrOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::ControlOperator"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ControlOperator"

+      hint="SysML::Stereotype::ControlOperator"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/ControlOperator"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::NoBuffer" identifier="org.eclipse.papyrus.sysml.stereotype.NoBuffer" hint="SysML::Stereotype::NoBuffer" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/NoBuffer"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxh7OjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::NoBuffer"

+      identifier="org.eclipse.papyrus.sysml.stereotype.NoBuffer"

+      hint="SysML::Stereotype::NoBuffer"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/NoBuffer"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Overwrite" identifier="org.eclipse.papyrus.sysml.stereotype.Overwrite" hint="SysML::Stereotype::Overwrite" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Overwrite"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_rRIxiLOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Overwrite"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Overwrite"

+      hint="SysML::Stereotype::Overwrite"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Overwrite"/>

   </elementTypeConfigurations>

-  

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
index ac67fa95a9c..6730535aa19 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
@@ -1,16 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"  metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations">

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Allocate" identifier="org.eclipse.papyrus.sysml.stereotype.Allocate" hint="SysML::Stereotype::Allocate" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocate"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_u9Zn4LOjEeWH6Y3Wi2YKxg"

+    name="elementTypeSetAllocations"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetAllocations"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_u9Zn4bOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Allocate"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Allocate"

+      hint="SysML::Stereotype::Allocate"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocate"/>

   </elementTypeConfigurations>

-  

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Allocated" identifier="org.eclipse.papyrus.sysml.stereotype.Allocated" hint="SysML::Stereotype::Allocated" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocated"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_u9Zn4rOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Allocated"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Allocated"

+      hint="SysML::Stereotype::Allocated"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocated"/>

   </elementTypeConfigurations>

-  

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::AllocateActivityPartition" identifier="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition" hint="SysML::Stereotype::AllocateActivityPartition" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/AllocateActivityPartition"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_u9Zn47OjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::AllocateActivityPartition"

+      identifier="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition"

+      hint="SysML::Stereotype::AllocateActivityPartition"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/AllocateActivityPartition"/>

   </elementTypeConfigurations>

-  

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
index 2671d1cdae0..a03f2165cf2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
@@ -1,34 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_3i038FYIEeS0WsAAtVmToA" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtREFYGEeS0WsAAtVmToA" name="SysML::Stereotype::Block" identifier="org.eclipse.papyrus.sysml.stereotype.Block" hint="SysML::Stereotype::Block" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_3i038FYIEeS0WsAAtVmToA"

+    name="elementTypeSetBlocks"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetBlocks"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtREFYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::Block"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Block"

+      hint="SysML::Stereotype::Block"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtREVYGEeS0WsAAtVmToA" name="SysML::Stereotype::DistributedProperty" identifier="org.eclipse.papyrus.sysml.stereotype.DistributedProperty" hint="SysML::Stereotype::DistributedProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/DistributedProperty"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtREVYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::DistributedProperty"

+      identifier="org.eclipse.papyrus.sysml.stereotype.DistributedProperty"

+      hint="SysML::Stereotype::DistributedProperty"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/DistributedProperty"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRElYGEeS0WsAAtVmToA" name="SysML::Stereotype::Dimension" identifier="org.eclipse.papyrus.sysml.stereotype.Dimension" hint="SysML::Stereotype::Dimension" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Dimension"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRElYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::Dimension"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Dimension"

+      hint="SysML::Stereotype::Dimension"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Dimension"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRE1YGEeS0WsAAtVmToA" name="SysML::Stereotype::Unit" identifier="org.eclipse.papyrus.sysml.stereotype.Unit" hint="SysML::Stereotype::Unit" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Unit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRE1YGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::Unit"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Unit"

+      hint="SysML::Stereotype::Unit"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Unit"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRFFYGEeS0WsAAtVmToA" name="SysML::Stereotype::ValueType" identifier="org.eclipse.papyrus.sysml.stereotype.ValueType" hint="SysML::Stereotype::ValueType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ValueType"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRFFYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::ValueType"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ValueType"

+      hint="SysML::Stereotype::ValueType"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ValueType"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRFVYGEeS0WsAAtVmToA" name="SysML::Stereotype::NestedConnectorEnd" identifier="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd" hint="SysML::Stereotype::NestedConnectorEnd" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/NestedConnectorEnd"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRFVYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::NestedConnectorEnd"

+      identifier="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd"

+      hint="SysML::Stereotype::NestedConnectorEnd"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/NestedConnectorEnd"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRFlYGEeS0WsAAtVmToA" name="SysML::Stereotype::ParticipantProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty" hint="SysML::Stereotype::ParticipantProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ParticipantProperty"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRFlYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::ParticipantProperty"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty"

+      hint="SysML::Stereotype::ParticipantProperty"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ParticipantProperty"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRF1YGEeS0WsAAtVmToA" name="SysML::Stereotype::ConnectorProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty" hint="SysML::Stereotype::ConnectorProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ConnectorProperty"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRF1YGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::ConnectorProperty"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty"

+      hint="SysML::Stereotype::ConnectorProperty"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ConnectorProperty"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRGFYGEeS0WsAAtVmToA" name="SysML::Stereotype::BindingConnector" identifier="org.eclipse.papyrus.sysml.stereotype.BindingConnector" hint="SysML::Stereotype::BindingConnector" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/BindingConnector"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRGFYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::BindingConnector"

+      identifier="org.eclipse.papyrus.sysml.stereotype.BindingConnector"

+      hint="SysML::Stereotype::BindingConnector"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/BindingConnector"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_hYtRGVYGEeS0WsAAtVmToA" name="SysML::Stereotype::PropertySpecificType" identifier="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType" hint="SysML::Stereotype::PropertySpecificType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/PropertySpecificType"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_hYtRGVYGEeS0WsAAtVmToA"

+      name="SysML::Stereotype::PropertySpecificType"

+      identifier="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType"

+      hint="SysML::Stereotype::PropertySpecificType"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/PropertySpecificType"/>

   </elementTypeConfigurations>

-  <adviceBindingsConfigurations xmi:id="_4Jt40FYIEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.stereotype.advice.Block" identifier="org.eclipse.papyrus.sysml.stereotype.advice.Block" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.stereotype.helper.advice.BlockEditHelperAdvice" inheritance="all" target="_hYtREFYGEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_4Jt40FYIEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.stereotype.advice.Block"

+      identifier="org.eclipse.papyrus.sysml.stereotype.advice.Block"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.stereotype.helper.advice.BlockEditHelperAdvice"

+      inheritance="all"

+      target="_hYtREFYGEeS0WsAAtVmToA"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
index b30c9c3ffff..0ffcfa8ab60 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
@@ -1,14 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints">

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock" hint="SysML::Stereotype::ConstraintBlock" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_0h9coLOjEeWH6Y3Wi2YKxg"

+    name="elementTypeSetConstraints"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetConstraints"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_0h9cobOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::ConstraintBlock"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock"

+      hint="SysML::Stereotype::ConstraintBlock"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock"/>

   </elementTypeConfigurations>

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty" hint="SysML::Stereotype::ConstraintProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_0h9corOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::ConstraintProperty"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty"

+      hint="SysML::Stereotype::ConstraintProperty"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty"/>

   </elementTypeConfigurations>

-  

-  

-  

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
index cc37bb9c6a3..82bc88054b1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
@@ -1,18 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"  metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Conform" identifier="org.eclipse.papyrus.sysml.stereotype.Conform" hint="SysML::Stereotype::Conform" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Conform"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_2o9lYLOjEeWH6Y3Wi2YKxg"

+    name="elementTypeSetModelElements"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetModelElements"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_2o9lYbOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Conform"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Conform"

+      hint="SysML::Stereotype::Conform"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Conform"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::View" identifier="org.eclipse.papyrus.sysml.stereotype.View" hint="SysML::Stereotype::View" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/View"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_2o9lYrOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::View"

+      identifier="org.eclipse.papyrus.sysml.stereotype.View"

+      hint="SysML::Stereotype::View"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/View"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::ViewPoint" identifier="org.eclipse.papyrus.sysml.stereotype.ViewPoint" hint="SysML::Stereotype::ViewPoint" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/ViewPoint"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_2o9lY7OjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::ViewPoint"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ViewPoint"

+      hint="SysML::Stereotype::ViewPoint"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/ViewPoint"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::Rationale" identifier="org.eclipse.papyrus.sysml.stereotype.Rationale" hint="SysML::Stereotype::Rationale" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Rationale"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_2o9lZLOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Rationale"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Rationale"

+      hint="SysML::Stereotype::Rationale"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Rationale"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::Problem" identifier="org.eclipse.papyrus.sysml.stereotype.Problem" hint="SysML::Stereotype::Problem" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Problem"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_2o9lZbOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Problem"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Problem"

+      hint="SysML::Stereotype::Problem"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Problem"/>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
index a03a2ab0ef6..b2381f812be 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
@@ -1,20 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows">

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::FlowPort" identifier="org.eclipse.papyrus.sysml.stereotype.FlowPort" hint="SysML::Stereotype::FlowPort" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowPort"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_6wATQLOjEeWH6Y3Wi2YKxg"

+    name="elementTypeSetPortsAndFlows"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetPortsAndFlows"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_6wATQbOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::FlowPort"

+      identifier="org.eclipse.papyrus.sysml.stereotype.FlowPort"

+      hint="SysML::Stereotype::FlowPort"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowPort"/>

   </elementTypeConfigurations>

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::FlowProperty" identifier="org.eclipse.papyrus.sysml.stereotype.FlowProperty" hint="SysML::Stereotype::FlowProperty" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowProperty"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_6wATQrOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::FlowProperty"

+      identifier="org.eclipse.papyrus.sysml.stereotype.FlowProperty"

+      hint="SysML::Stereotype::FlowProperty"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowProperty"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::FlowSpecification" identifier="org.eclipse.papyrus.sysml.stereotype.FlowSpecification" hint="SysML::Stereotype::FlowSpecification" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowSpecification"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_6wATQ7OjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::FlowSpecification"

+      identifier="org.eclipse.papyrus.sysml.stereotype.FlowSpecification"

+      hint="SysML::Stereotype::FlowSpecification"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowSpecification"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::ItemFlow" identifier="org.eclipse.papyrus.sysml.stereotype.ItemFlow" hint="SysML::Stereotype::ItemFlow" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/ItemFlow"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_6wA6ULOjEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::ItemFlow"

+      identifier="org.eclipse.papyrus.sysml.stereotype.ItemFlow"

+      hint="SysML::Stereotype::ItemFlow"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/ItemFlow"/>

   </elementTypeConfigurations>

-  

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
index d1d73b061bc..2566ad766f1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
@@ -1,32 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"  metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements">

-

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::DeriveReqt" identifier="org.eclipse.papyrus.sysml.stereotype.DeriveReqt" hint="SysML::Stereotype::DeriveReqt" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/DeriveReqt"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_LYuC4LOtEeWH6Y3Wi2YKxg"

+    name="elementTypeSetRequirements"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetRequirements"

+    metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC4bOtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::DeriveReqt"

+      identifier="org.eclipse.papyrus.sysml.stereotype.DeriveReqt"

+      hint="SysML::Stereotype::DeriveReqt"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/DeriveReqt"/>

   </elementTypeConfigurations>

-  

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" name="SysML::Stereotype::Verify" identifier="org.eclipse.papyrus.sysml.stereotype.Verify" hint="SysML::Stereotype::Verify" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Verify"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC4rOtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Verify"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Verify"

+      hint="SysML::Stereotype::Verify"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Verify"/>

   </elementTypeConfigurations>

-  

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::Copy" identifier="org.eclipse.papyrus.sysml.stereotype.Copy" hint="SysML::Stereotype::Copy" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Copy"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC47OtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Copy"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Copy"

+      hint="SysML::Stereotype::Copy"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Copy"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::Satisfy" identifier="org.eclipse.papyrus.sysml.stereotype.Satisfy" hint="SysML::Stereotype::Satisfy" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Satisfy"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC5LOtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Satisfy"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Satisfy"

+      hint="SysML::Stereotype::Satisfy"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Satisfy"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::TestCase" identifier="org.eclipse.papyrus.sysml.stereotype.TestCase" hint="SysML::Stereotype::TestCase" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/TestCase"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC5bOtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::TestCase"

+      identifier="org.eclipse.papyrus.sysml.stereotype.TestCase"

+      hint="SysML::Stereotype::TestCase"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/TestCase"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::Requirement" identifier="org.eclipse.papyrus.sysml.stereotype.Requirement" hint="SysML::Stereotype::Requirement" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC5rOtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::Requirement"

+      identifier="org.eclipse.papyrus.sysml.stereotype.Requirement"

+      hint="SysML::Stereotype::Requirement"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>

   </elementTypeConfigurations>

-  

-    <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"  name="SysML::Stereotype::RequirementRelated" identifier="org.eclipse.papyrus.sysml.stereotype.RequirementRelated" hint="SysML::Stereotype::RequirementRelated" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/RequirementRelated"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_LYuC57OtEeWH6Y3Wi2YKxg"

+      name="SysML::Stereotype::RequirementRelated"

+      identifier="org.eclipse.papyrus.sysml.stereotype.RequirementRelated"

+      hint="SysML::Stereotype::RequirementRelated"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/RequirementRelated"/>

   </elementTypeConfigurations>

-  

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
index 4ea03a24b6e..ac7e3ad1aec 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
@@ -1,248 +1,748 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_649xgFYBEeS0WsAAtVmToA" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_64-_oFYBEeS0WsAAtVmToA" name="SysML::ActorPartProperty" identifier="org.eclipse.papyrus.sysml.ActorPartProperty" hint="SysML::ActorPartProperty">

-    <iconEntry xmi:id="_65ANwFYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_649xgFYBEeS0WsAAtVmToA"

+    name="elementTypeSetSysML"

+    identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetSysML"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_64-_oFYBEeS0WsAAtVmToA"

+      name="SysML::ActorPartProperty"

+      identifier="org.eclipse.papyrus.sysml.ActorPartProperty"

+      hint="SysML::ActorPartProperty">

+    <iconEntry

+        xmi:id="_65ANwFYBEeS0WsAAtVmToA"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65Bb4FYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ActorPartPropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CC8FYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ActorPartPropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CC8VYBEeS0WsAAtVmToA" name="SysML::Allocate" identifier="org.eclipse.papyrus.sysml.Allocate" hint="SysML::Allocate">

+    <editHelperAdviceConfiguration

+        xmi:id="_65Bb4FYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ActorPartPropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CC8FYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ActorPartPropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CC8VYBEeS0WsAAtVmToA"

+      name="SysML::Allocate"

+      identifier="org.eclipse.papyrus.sysml.Allocate"

+      hint="SysML::Allocate">

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CC8lYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CC81YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CC9FYBEeS0WsAAtVmToA" name="SysML::Association" identifier="org.eclipse.papyrus.sysml.Association" hint="SysML::Association">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CC8lYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CC81YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CC9FYBEeS0WsAAtVmToA"

+      name="SysML::Association"

+      identifier="org.eclipse.papyrus.sysml.Association"

+      hint="SysML::Association">

     <specializedTypesID>org.eclipse.papyrus.uml.AssociationBase</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqAFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqAVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqAlYBEeS0WsAAtVmToA" name="SysML::AssociationComposite" identifier="org.eclipse.papyrus.sysml.AssociationComposite" hint="SysML::AssociationComposite">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqAFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqAVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqAlYBEeS0WsAAtVmToA"

+      name="SysML::AssociationComposite"

+      identifier="org.eclipse.papyrus.sysml.AssociationComposite"

+      hint="SysML::AssociationComposite">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqA1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqBFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqBVYBEeS0WsAAtVmToA" name="SysML::AssociationCompositeDirected" identifier="org.eclipse.papyrus.sysml.AssociationCompositeDirected" hint="SysML::AssociationCompositeDirected">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqA1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqBFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqBVYBEeS0WsAAtVmToA"

+      name="SysML::AssociationCompositeDirected"

+      identifier="org.eclipse.papyrus.sysml.AssociationCompositeDirected"

+      hint="SysML::AssociationCompositeDirected">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqBlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqB1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqCFYBEeS0WsAAtVmToA" name="SysML::AssociationNone" identifier="org.eclipse.papyrus.sysml.AssociationNone" hint="SysML::AssociationNone">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqBlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqB1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqCFYBEeS0WsAAtVmToA"

+      name="SysML::AssociationNone"

+      identifier="org.eclipse.papyrus.sysml.AssociationNone"

+      hint="SysML::AssociationNone">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqCVYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqClYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqC1YBEeS0WsAAtVmToA" name="SysML::AssociationNoneDirected" identifier="org.eclipse.papyrus.sysml.AssociationNoneDirected" hint="SysML::AssociationNoneDirected">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqCVYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqClYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqC1YBEeS0WsAAtVmToA"

+      name="SysML::AssociationNoneDirected"

+      identifier="org.eclipse.papyrus.sysml.AssociationNoneDirected"

+      hint="SysML::AssociationNoneDirected">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqDFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqDVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqDlYBEeS0WsAAtVmToA" name="SysML::AssociationShared" identifier="org.eclipse.papyrus.sysml.AssociationShared" hint="SysML::AssociationShared">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqDFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqDVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqDlYBEeS0WsAAtVmToA"

+      name="SysML::AssociationShared"

+      identifier="org.eclipse.papyrus.sysml.AssociationShared"

+      hint="SysML::AssociationShared">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65CqD1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65CqEFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65CqEVYBEeS0WsAAtVmToA" name="SysML::AssociationSharedDirected" identifier="org.eclipse.papyrus.sysml.AssociationSharedDirected" hint="SysML::AssociationSharedDirected">

+    <editHelperAdviceConfiguration

+        xmi:id="_65CqD1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65CqEFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65CqEVYBEeS0WsAAtVmToA"

+      name="SysML::AssociationSharedDirected"

+      identifier="org.eclipse.papyrus.sysml.AssociationSharedDirected"

+      hint="SysML::AssociationSharedDirected">

     <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DREFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DREVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DRElYBEeS0WsAAtVmToA" name="SysML::Block" identifier="org.eclipse.papyrus.sysml.Block" hint="SysML::Block">

-    <iconEntry xmi:id="_65DRE1YBEeS0WsAAtVmToA" iconPath="/icons/blocks/Block.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DREFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DREVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65DRElYBEeS0WsAAtVmToA"

+      name="SysML::Block"

+      identifier="org.eclipse.papyrus.sysml.Block"

+      hint="SysML::Block">

+    <iconEntry

+        xmi:id="_65DRE1YBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/Block.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DRFFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DRFVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DRFlYBEeS0WsAAtVmToA" name="SysML::Conform" identifier="org.eclipse.papyrus.sysml.Conform" hint="SysML::Conform">

-    <iconEntry xmi:id="_65DRF1YBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Conform.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DRFFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DRFVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65DRFlYBEeS0WsAAtVmToA"

+      name="SysML::Conform"

+      identifier="org.eclipse.papyrus.sysml.Conform"

+      hint="SysML::Conform">

+    <iconEntry

+        xmi:id="_65DRF1YBEeS0WsAAtVmToA"

+        iconPath="/icons/modelelements/Conform.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DRGFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DRGVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DRGlYBEeS0WsAAtVmToA" name="SysML::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.ConstraintBlock" hint="SysML::ConstraintBlock">

-    <iconEntry xmi:id="_65DRG1YBEeS0WsAAtVmToA" iconPath="/icons/constraints/ConstraintBlock.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DRGFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DRGVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65DRGlYBEeS0WsAAtVmToA"

+      name="SysML::ConstraintBlock"

+      identifier="org.eclipse.papyrus.sysml.ConstraintBlock"

+      hint="SysML::ConstraintBlock">

+    <iconEntry

+        xmi:id="_65DRG1YBEeS0WsAAtVmToA"

+        iconPath="/icons/constraints/ConstraintBlock.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DRHFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DRHVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DRHlYBEeS0WsAAtVmToA" name="SysML::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.ConstraintProperty" hint="SysML::ConstraintProperty">

-    <iconEntry xmi:id="_65DRH1YBEeS0WsAAtVmToA" iconPath="/icons/constraints/ConstraintProperty.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DRHFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DRHVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65DRHlYBEeS0WsAAtVmToA"

+      name="SysML::ConstraintProperty"

+      identifier="org.eclipse.papyrus.sysml.ConstraintProperty"

+      hint="SysML::ConstraintProperty">

+    <iconEntry

+        xmi:id="_65DRH1YBEeS0WsAAtVmToA"

+        iconPath="/icons/constraints/ConstraintProperty.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DRIFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DRIVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65DRIlYBEeS0WsAAtVmToA" name="SysML::Copy" identifier="org.eclipse.papyrus.sysml.Copy" hint="SysML::Copy">

-    <iconEntry xmi:id="_65DRI1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Copy.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DRIFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DRIVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65DRIlYBEeS0WsAAtVmToA"

+      name="SysML::Copy"

+      identifier="org.eclipse.papyrus.sysml.Copy"

+      hint="SysML::Copy">

+    <iconEntry

+        xmi:id="_65DRI1YBEeS0WsAAtVmToA"

+        iconPath="/icons/requirements/Copy.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65DRJFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65DRJVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4IFYBEeS0WsAAtVmToA" name="SysML::DeriveReqt" identifier="org.eclipse.papyrus.sysml.DeriveReqt" hint="SysML::DeriveReqt">

-    <iconEntry xmi:id="_65D4IVYBEeS0WsAAtVmToA" iconPath="/icons/requirements/DeriveReqt.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65DRJFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65DRJVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4IFYBEeS0WsAAtVmToA"

+      name="SysML::DeriveReqt"

+      identifier="org.eclipse.papyrus.sysml.DeriveReqt"

+      hint="SysML::DeriveReqt">

+    <iconEntry

+        xmi:id="_65D4IVYBEeS0WsAAtVmToA"

+        iconPath="/icons/requirements/DeriveReqt.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4IlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65D4I1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4JFYBEeS0WsAAtVmToA" name="SysML::Dimension" identifier="org.eclipse.papyrus.sysml.Dimension" hint="SysML::Dimension">

-    <iconEntry xmi:id="_65D4JVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/Dimension.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4IlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65D4I1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4JFYBEeS0WsAAtVmToA"

+      name="SysML::Dimension"

+      identifier="org.eclipse.papyrus.sysml.Dimension"

+      hint="SysML::Dimension">

+    <iconEntry

+        xmi:id="_65D4JVYBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/Dimension.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4JlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65D4J1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4KFYBEeS0WsAAtVmToA" name="SysML::FlowPort" identifier="org.eclipse.papyrus.sysml.FlowPort" hint="SysML::FlowPort">

-    <iconEntry xmi:id="_65D4KVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4JlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65D4J1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4KFYBEeS0WsAAtVmToA"

+      name="SysML::FlowPort"

+      identifier="org.eclipse.papyrus.sysml.FlowPort"

+      hint="SysML::FlowPort">

+    <iconEntry

+        xmi:id="_65D4KVYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowPort.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4KlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65D4K1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4LFYBEeS0WsAAtVmToA" name="SysML::FlowPort_InOut" identifier="org.eclipse.papyrus.sysml.FlowPort_InOut" hint="SysML::FlowPort_InOut">

-    <iconEntry xmi:id="_65D4LVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4KlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65D4K1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4LFYBEeS0WsAAtVmToA"

+      name="SysML::FlowPort_InOut"

+      identifier="org.eclipse.papyrus.sysml.FlowPort_InOut"

+      hint="SysML::FlowPort_InOut">

+    <iconEntry

+        xmi:id="_65D4LVYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowPort.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4LlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65D4L1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4MFYBEeS0WsAAtVmToA" name="SysML::FlowPort_In" identifier="org.eclipse.papyrus.sysml.FlowPort_In" hint="SysML::FlowPort_In">

-    <iconEntry xmi:id="_65D4MVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4LlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65D4L1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4MFYBEeS0WsAAtVmToA"

+      name="SysML::FlowPort_In"

+      identifier="org.eclipse.papyrus.sysml.FlowPort_In"

+      hint="SysML::FlowPort_In">

+    <iconEntry

+        xmi:id="_65D4MVYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowPort.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4MlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65D4M1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65D4NFYBEeS0WsAAtVmToA" name="SysML::FlowPort_Out" identifier="org.eclipse.papyrus.sysml.FlowPort_Out" hint="SysML::FlowPort_Out">

-    <iconEntry xmi:id="_65D4NVYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4MlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65D4M1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65D4NFYBEeS0WsAAtVmToA"

+      name="SysML::FlowPort_Out"

+      identifier="org.eclipse.papyrus.sysml.FlowPort_Out"

+      hint="SysML::FlowPort_Out">

+    <iconEntry

+        xmi:id="_65D4NVYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowPort.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65D4NlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfMFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfMVYBEeS0WsAAtVmToA" name="SysML::FlowPort_NA" identifier="org.eclipse.papyrus.sysml.FlowPort_NA" hint="SysML::FlowPort_NA">

-    <iconEntry xmi:id="_65EfMlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowPort_NA.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65D4NlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfMFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfMVYBEeS0WsAAtVmToA"

+      name="SysML::FlowPort_NA"

+      identifier="org.eclipse.papyrus.sysml.FlowPort_NA"

+      hint="SysML::FlowPort_NA">

+    <iconEntry

+        xmi:id="_65EfMlYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowPort_NA.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65EfM1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfNFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfNVYBEeS0WsAAtVmToA" name="SysML::FlowProperty" identifier="org.eclipse.papyrus.sysml.FlowProperty" hint="SysML::FlowProperty">

-    <iconEntry xmi:id="_65EfNlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowProperty.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65EfM1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfNFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfNVYBEeS0WsAAtVmToA"

+      name="SysML::FlowProperty"

+      identifier="org.eclipse.papyrus.sysml.FlowProperty"

+      hint="SysML::FlowProperty">

+    <iconEntry

+        xmi:id="_65EfNlYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowProperty.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65EfN1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfOFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfOVYBEeS0WsAAtVmToA" name="SysML::FlowSpecification" identifier="org.eclipse.papyrus.sysml.FlowSpecification" hint="SysML::FlowSpecification">

-    <iconEntry xmi:id="_65EfOlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/FlowSpecification.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65EfN1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfOFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfOVYBEeS0WsAAtVmToA"

+      name="SysML::FlowSpecification"

+      identifier="org.eclipse.papyrus.sysml.FlowSpecification"

+      hint="SysML::FlowSpecification">

+    <iconEntry

+        xmi:id="_65EfOlYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/FlowSpecification.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65EfO1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfPFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfPVYBEeS0WsAAtVmToA" name="SysML::ItemFlow" identifier="org.eclipse.papyrus.sysml.ItemFlow" hint="SysML::ItemFlow">

-    <iconEntry xmi:id="_65EfPlYBEeS0WsAAtVmToA" iconPath="/icons/portandflows/ItemFlow.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65EfO1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfPFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfPVYBEeS0WsAAtVmToA"

+      name="SysML::ItemFlow"

+      identifier="org.eclipse.papyrus.sysml.ItemFlow"

+      hint="SysML::ItemFlow">

+    <iconEntry

+        xmi:id="_65EfPlYBEeS0WsAAtVmToA"

+        iconPath="/icons/portandflows/ItemFlow.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65EfP1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfQFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfQVYBEeS0WsAAtVmToA" name="SysML::PartProperty" identifier="org.eclipse.papyrus.sysml.PartProperty" hint="SysML::PartProperty">

-    <iconEntry xmi:id="_65EfQlYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65EfP1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfQFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfQVYBEeS0WsAAtVmToA"

+      name="SysML::PartProperty"

+      identifier="org.eclipse.papyrus.sysml.PartProperty"

+      hint="SysML::PartProperty">

+    <iconEntry

+        xmi:id="_65EfQlYBEeS0WsAAtVmToA"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65EfQ1YBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65EfRFYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65EfRVYBEeS0WsAAtVmToA" name="SysML::Problem" identifier="org.eclipse.papyrus.sysml.Problem" hint="SysML::Problem">

-    <iconEntry xmi:id="_65EfRlYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Problem.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65EfQ1YBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65EfRFYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65EfRVYBEeS0WsAAtVmToA"

+      name="SysML::Problem"

+      identifier="org.eclipse.papyrus.sysml.Problem"

+      hint="SysML::Problem">

+    <iconEntry

+        xmi:id="_65EfRlYBEeS0WsAAtVmToA"

+        iconPath="/icons/modelelements/Problem.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FGQFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FGQVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FGQlYBEeS0WsAAtVmToA" name="SysML::Rationale" identifier="org.eclipse.papyrus.sysml.Rationale" hint="SysML::Rationale">

-    <iconEntry xmi:id="_65FGQ1YBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Rationale.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FGQFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FGQVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FGQlYBEeS0WsAAtVmToA"

+      name="SysML::Rationale"

+      identifier="org.eclipse.papyrus.sysml.Rationale"

+      hint="SysML::Rationale">

+    <iconEntry

+        xmi:id="_65FGQ1YBEeS0WsAAtVmToA"

+        iconPath="/icons/modelelements/Rationale.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FGRFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FGRVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FGRlYBEeS0WsAAtVmToA" name="SysML::ReferenceProperty" identifier="org.eclipse.papyrus.sysml.ReferenceProperty" hint="SysML::ReferenceProperty">

-    <iconEntry xmi:id="_65FGR1YBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FGRFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FGRVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FGRlYBEeS0WsAAtVmToA"

+      name="SysML::ReferenceProperty"

+      identifier="org.eclipse.papyrus.sysml.ReferenceProperty"

+      hint="SysML::ReferenceProperty">

+    <iconEntry

+        xmi:id="_65FGR1YBEeS0WsAAtVmToA"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FGSFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FGSVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FGSlYBEeS0WsAAtVmToA" name="SysML::Requirement" identifier="org.eclipse.papyrus.sysml.Requirement" hint="SysML::Requirement">

-    <iconEntry xmi:id="_65FGS1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Requirement.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FGSFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FGSVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FGSlYBEeS0WsAAtVmToA"

+      name="SysML::Requirement"

+      identifier="org.eclipse.papyrus.sysml.Requirement"

+      hint="SysML::Requirement">

+    <iconEntry

+        xmi:id="_65FGS1YBEeS0WsAAtVmToA"

+        iconPath="/icons/requirements/Requirement.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FGTFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FGTVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FGTlYBEeS0WsAAtVmToA" name="SysML::Satisfy" identifier="org.eclipse.papyrus.sysml.Satisfy" hint="SysML::Satisfy">

-    <iconEntry xmi:id="_65FGT1YBEeS0WsAAtVmToA" iconPath="/icons/requirements/Satisfy.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FGTFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FGTVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FGTlYBEeS0WsAAtVmToA"

+      name="SysML::Satisfy"

+      identifier="org.eclipse.papyrus.sysml.Satisfy"

+      hint="SysML::Satisfy">

+    <iconEntry

+        xmi:id="_65FGT1YBEeS0WsAAtVmToA"

+        iconPath="/icons/requirements/Satisfy.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FGUFYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FGUVYBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FtUFYBEeS0WsAAtVmToA" name="SysML::Unit" identifier="org.eclipse.papyrus.sysml.Unit" hint="SysML::Unit">

-    <iconEntry xmi:id="_65FtUVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/Unit.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FGUFYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FGUVYBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FtUFYBEeS0WsAAtVmToA"

+      name="SysML::Unit"

+      identifier="org.eclipse.papyrus.sysml.Unit"

+      hint="SysML::Unit">

+    <iconEntry

+        xmi:id="_65FtUVYBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/Unit.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FtUlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FtU1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FtVFYBEeS0WsAAtVmToA" name="SysML::ValueProperty" identifier="org.eclipse.papyrus.sysml.ValueProperty" hint="SysML::ValueProperty">

-    <iconEntry xmi:id="_65FtVVYBEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FtUlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FtU1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FtVFYBEeS0WsAAtVmToA"

+      name="SysML::ValueProperty"

+      identifier="org.eclipse.papyrus.sysml.ValueProperty"

+      hint="SysML::ValueProperty">

+    <iconEntry

+        xmi:id="_65FtVVYBEeS0WsAAtVmToA"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FtVlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FtV1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FtWFYBEeS0WsAAtVmToA" name="SysML::ValueType" identifier="org.eclipse.papyrus.sysml.ValueType" hint="SysML::ValueType">

-    <iconEntry xmi:id="_65FtWVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FtVlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FtV1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FtWFYBEeS0WsAAtVmToA"

+      name="SysML::ValueType"

+      identifier="org.eclipse.papyrus.sysml.ValueType"

+      hint="SysML::ValueType">

+    <iconEntry

+        xmi:id="_65FtWVYBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/ValueType.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FtWlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FtW1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FtXFYBEeS0WsAAtVmToA" name="SysML::ValueType_Enumeration" identifier="org.eclipse.papyrus.sysml.ValueType_Enumeration" hint="SysML::ValueType_Enumeration">

-    <iconEntry xmi:id="_65FtXVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FtWlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FtW1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FtXFYBEeS0WsAAtVmToA"

+      name="SysML::ValueType_Enumeration"

+      identifier="org.eclipse.papyrus.sysml.ValueType_Enumeration"

+      hint="SysML::ValueType_Enumeration">

+    <iconEntry

+        xmi:id="_65FtXVYBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/ValueType.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FtXlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FtX1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65FtYFYBEeS0WsAAtVmToA" name="SysML::ValueType_PrimitiveType" identifier="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" hint="SysML::ValueType_PrimitiveType">

-    <iconEntry xmi:id="_65FtYVYBEeS0WsAAtVmToA" iconPath="/icons/blocks/ValueType.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FtXlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FtX1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65FtYFYBEeS0WsAAtVmToA"

+      name="SysML::ValueType_PrimitiveType"

+      identifier="org.eclipse.papyrus.sysml.ValueType_PrimitiveType"

+      hint="SysML::ValueType_PrimitiveType">

+    <iconEntry

+        xmi:id="_65FtYVYBEeS0WsAAtVmToA"

+        iconPath="/icons/blocks/ValueType.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65FtYlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65FtY1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65GUYFYBEeS0WsAAtVmToA" name="SysML::Verify" identifier="org.eclipse.papyrus.sysml.Verify" hint="SysML::Verify">

-    <iconEntry xmi:id="_65GUYVYBEeS0WsAAtVmToA" iconPath="/icons/requirements/Verify.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65FtYlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65FtY1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65GUYFYBEeS0WsAAtVmToA"

+      name="SysML::Verify"

+      identifier="org.eclipse.papyrus.sysml.Verify"

+      hint="SysML::Verify">

+    <iconEntry

+        xmi:id="_65GUYVYBEeS0WsAAtVmToA"

+        iconPath="/icons/requirements/Verify.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65GUYlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65GUY1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65GUZFYBEeS0WsAAtVmToA" name="SysML::View" identifier="org.eclipse.papyrus.sysml.View" hint="SysML::View">

-    <iconEntry xmi:id="_65GUZVYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/View.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65GUYlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65GUY1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65GUZFYBEeS0WsAAtVmToA"

+      name="SysML::View"

+      identifier="org.eclipse.papyrus.sysml.View"

+      hint="SysML::View">

+    <iconEntry

+        xmi:id="_65GUZVYBEeS0WsAAtVmToA"

+        iconPath="/icons/modelelements/View.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65GUZlYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65GUZ1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_65GUaFYBEeS0WsAAtVmToA" name="SysML::ViewPoint" identifier="org.eclipse.papyrus.sysml.ViewPoint" hint="SysML::ViewPoint">

-    <iconEntry xmi:id="_65GUaVYBEeS0WsAAtVmToA" iconPath="/icons/modelelements/Viewpoint.gif" bundleId="org.eclipse.sysml"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65GUZlYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65GUZ1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_65GUaFYBEeS0WsAAtVmToA"

+      name="SysML::ViewPoint"

+      identifier="org.eclipse.papyrus.sysml.ViewPoint"

+      hint="SysML::ViewPoint">

+    <iconEntry

+        xmi:id="_65GUaVYBEeS0WsAAtVmToA"

+        iconPath="/icons/modelelements/Viewpoint.gif"

+        bundleId="org.eclipse.sysml"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_65GUalYBEeS0WsAAtVmToA" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_65GUa1YBEeS0WsAAtVmToA" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher"/>

-  </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_hoac0FYNEeSSidqjsigY_Q" name="SysML::ConstraintBlockParameter" identifier="org.eclipse.papyrus.sysml.ConstraintBlockParameter" hint="SysML::ConstraintBlockParameter">

-    <iconEntry xmi:id="_2MWa8FYNEeSSidqjsigY_Q" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_65GUalYBEeS0WsAAtVmToA"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_65GUa1YBEeS0WsAAtVmToA"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_hoac0FYNEeSSidqjsigY_Q"

+      name="SysML::ConstraintBlockParameter"

+      identifier="org.eclipse.papyrus.sysml.ConstraintBlockParameter"

+      hint="SysML::ConstraintBlockParameter">

+    <iconEntry

+        xmi:id="_2MWa8FYNEeSSidqjsigY_Q"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_pV9-YFYNEeSSidqjsigY_Q" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice"/>

-    <matcherConfiguration xmi:id="_4QgrEFYNEeSSidqjsigY_Q" matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

-  </elementTypeConfigurations>

-  <adviceBindingsConfigurations xmi:id="_65IJkFYBEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_pV9-YFYNEeSSidqjsigY_Q"

+        editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice"/>

+    <matcherConfiguration

+        xmi:id="_4QgrEFYNEeSSidqjsigY_Q"

+        matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_65IJkFYBEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice"

+      identifier="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xmi:id="_Kse4IFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.Classifier" identifier="org.eclipse.papyrus.sysml.advice.Classifier" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0z1YCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_Kse4IFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.Classifier"

+      identifier="org.eclipse.papyrus.sysml.advice.Classifier"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0z1YCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xmi:id="_XFKsEFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.BlockConnector" identifier="org.eclipse.papyrus.sysml.advice.BlockConnector" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.BlockConnectorEditHelperAdvice" inheritance="all" target="_65DRElYBEeS0WsAAtVmToA"/>

-  <adviceBindingsConfigurations xmi:id="_iARuwFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.Connector" identifier="org.eclipse.papyrus.sysml.advice.Connector" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ConnectorEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_XFKsEFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.BlockConnector"

+      identifier="org.eclipse.papyrus.sysml.advice.BlockConnector"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.BlockConnectorEditHelperAdvice"

+      inheritance="all"

+      target="_65DRElYBEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_iARuwFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.Connector"

+      identifier="org.eclipse.papyrus.sysml.advice.Connector"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ConnectorEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xmi:id="_pCAFEFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.Property" identifier="org.eclipse.papyrus.sysml.advice.Property" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_pCAFEFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.Property"

+      identifier="org.eclipse.papyrus.sysml.advice.Property"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xmi:id="_vpsKwFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.Package" identifier="org.eclipse.papyrus.sysml.advice.Package" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PackageEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_vpsKwFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.Package"

+      identifier="org.eclipse.papyrus.sysml.advice.Package"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PackageEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

-  <adviceBindingsConfigurations xmi:id="_2t_7AFYDEeS0WsAAtVmToA" name="org.eclipse.papyrus.sysml.advice.Actor" identifier="org.eclipse.papyrus.sysml.advice.Actor" editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ActorEditHelperAdvice" inheritance="all">

-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScV8UVYCEeS0WsAAtVmToA"/>

+  <adviceBindingsConfigurations

+      xmi:id="_2t_7AFYDEeS0WsAAtVmToA"

+      name="org.eclipse.papyrus.sysml.advice.Actor"

+      identifier="org.eclipse.papyrus.sysml.advice.Actor"

+      editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ActorEditHelperAdvice"

+      inheritance="all">

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScV8UVYCEeS0WsAAtVmToA"/>

   </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
index 41a64414aab..c34b3200766 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
@@ -371,56 +371,56 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetActivities"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-activities.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetAllocations"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-allocations.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetBlocks"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-blocks.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetConstraints"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-constraints.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetModelElements"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-modelelements.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetPortsAndFlows"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-portsandflows.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetRequirements"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-requirements.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.sysml.service.types.elementTypeSetSysML"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
index 2c9c1c22402..f7a5feed26d 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
@@ -59,6 +59,8 @@ class BaseElementTypeSetBlock {
 
 	private static final String UML_ELEMENT_TYPE_SET = "org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"; //$NON-NLS-1$
 
+	private static final String CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext";
+
 	private final GeneratorWizardModel model;
 
 	private final BiMap<String, ElementTypeSetConfiguration> elementTypeSets;
@@ -67,7 +69,7 @@ class BaseElementTypeSetBlock {
 		super();
 
 		this.model = model;
-		this.elementTypeSets = HashBiMap.create(ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations());
+		this.elementTypeSets = HashBiMap.create(ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().get(CONTEXT_ID));
 	}
 
 	public void createControl(Composite parent) {
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend
index bd66c65b6df..5c0a0bf4306 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend
@@ -40,6 +40,9 @@ class Identifiers {
     final String umlElementTypesSet = "org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"
     
     @Accessors
+    final String contextId = "org.eclipse.papyrus.infra.services.edit.TypeContext";
+    
+    @Accessors
     String baseElementTypesSet = umlElementTypesSet
     
     @Accessors
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend
index dff572732b2..47dae5a4a72 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend
@@ -51,7 +51,7 @@ class UMLElementTypes {
     }
 
     def getBaseUMLElementTypeSet() {
-        ElementTypeSetConfigurationRegistry.getInstance.getElementTypeSetConfigurations().get(umlElementTypesSet)
+		ElementTypeSetConfigurationRegistry.getInstance.getElementTypeSetConfigurations().get(contextId).get(umlElementTypesSet)
     }
 
     def getBaseUMLElementTypes() {
@@ -76,7 +76,7 @@ class UMLElementTypes {
     }
 
     def getBaseElementTypeSet() {
-        baseElementTypesSetConfiguration ?: ElementTypeSetConfigurationRegistry.getInstance.getElementTypeSetConfigurations().get(baseElementTypesSet)
+        baseElementTypesSetConfiguration ?: ElementTypeSetConfigurationRegistry.getInstance.getElementTypeSetConfigurations().get(contextId).get(baseElementTypesSet)
     }
     
     def getBaseElementTypes() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
index 782f25f2654..a7507c88e51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
@@ -1,762 +1,2293 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" name="PapyrusUMLActivityDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" name="Accept Event Action" identifier="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063" hint="3063">
-    <iconEntry xmi:id="_x8G0ymaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmi:id="_x8G0YGaNEeSyJIsxLao1Pw"
+    name="PapyrusUMLActivityDiagram"
+    identifier="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0yWaNEeSyJIsxLao1Pw"
+      name="Accept Event Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063"
+      hint="3063">
+    <iconEntry
+        xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/AcceptEventAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0cWaNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016" hint="3016">
-    <iconEntry xmi:id="_x8G0cmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0cWaNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016"
+      hint="3016">
+    <iconEntry
+        xmi:id="_x8G0cmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0e2aNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018" hint="3018">
-    <iconEntry xmi:id="_x8G0fGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0e2aNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018"
+      hint="3018">
+    <iconEntry
+        xmi:id="_x8G0fGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0g2aNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021" hint="3021">
-    <iconEntry xmi:id="_x8G0hGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0g2aNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021"
+      hint="3021">
+    <iconEntry
+        xmi:id="_x8G0hGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0jWaNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026" hint="3026">
-    <iconEntry xmi:id="_x8G0jmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0jWaNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026"
+      hint="3026">
+    <iconEntry
+        xmi:id="_x8G0jmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0r2aNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047" hint="3047">
-    <iconEntry xmi:id="_x8G0sGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0r2aNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047"
+      hint="3047">
+    <iconEntry
+        xmi:id="_x8G0sGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0tWaNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050" hint="3050">
-    <iconEntry xmi:id="_x8G0tmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0tWaNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050"
+      hint="3050">
+    <iconEntry
+        xmi:id="_x8G0tmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0u2aNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053" hint="3053">
-    <iconEntry xmi:id="_x8G0vGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0u2aNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053"
+      hint="3053">
+    <iconEntry
+        xmi:id="_x8G0vGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0w2aNEeSyJIsxLao1Pw" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061" hint="3061">
-    <iconEntry xmi:id="_x8G0xGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0w2aNEeSyJIsxLao1Pw"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061"
+      hint="3061">
+    <iconEntry
+        xmi:id="_x8G0xGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0aWaNEeSyJIsxLao1Pw" name="Activity Final Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005" hint="3005">
-    <iconEntry xmi:id="_x8G0amaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActivityFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0aWaNEeSyJIsxLao1Pw"
+      name="Activity Final Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005"
+      hint="3005">
+    <iconEntry
+        xmi:id="_x8G0amaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActivityFinalNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActivityFinalNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0x2aNEeSyJIsxLao1Pw" name="Activity Parameter Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059" hint="3059">
-    <iconEntry xmi:id="_x8G0yGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0x2aNEeSyJIsxLao1Pw"
+      name="Activity Parameter Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059"
+      hint="3059">
+    <iconEntry
+        xmi:id="_x8G0yGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActivityParameterNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbiGaNEeSyJIsxLao1Pw" name="Activity Partition" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067" hint="3067">
-    <iconEntry xmi:id="_x8HbiWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbiGaNEeSyJIsxLao1Pw"
+      name="Activity Partition"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067"
+      hint="3067">
+    <iconEntry
+        xmi:id="_x8HbiWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ActivityPartition.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbvmaNEeSyJIsxLao1Pw" name="Activity" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_2001" hint="2001">
-    <iconEntry xmi:id="_x8Hbv2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbvmaNEeSyJIsxLao1Pw"
+      name="Activity"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_2001"
+      hint="2001">
+    <iconEntry
+        xmi:id="_x8Hbv2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Activity.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbkmaNEeSyJIsxLao1Pw" name="Activity" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_3083" hint="3083">
-    <iconEntry xmi:id="_x8Hbk2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbkmaNEeSyJIsxLao1Pw"
+      name="Activity"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_3083"
+      hint="3083">
+    <iconEntry
+        xmi:id="_x8Hbk2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Activity.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HboGaNEeSyJIsxLao1Pw" name="Add Structural Feature Value Action" identifier="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091" hint="3091">
-    <iconEntry xmi:id="_x8HboWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HboGaNEeSyJIsxLao1Pw"
+      name="Add Structural Feature Value Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091"
+      hint="3091">
+    <iconEntry
+        xmi:id="_x8HboWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.AddStructuralFeatureValueAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbsGaNEeSyJIsxLao1Pw" name="Add Variable Value Action" identifier="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099" hint="3099">
-    <iconEntry xmi:id="_x8HbsWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/AddVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbsGaNEeSyJIsxLao1Pw"
+      name="Add Variable Value Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099"
+      hint="3099">
+    <iconEntry
+        xmi:id="_x8HbsWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/AddVariableValueAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.AddVariableValueAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbtmaNEeSyJIsxLao1Pw" name="Broadcast Signal Action" identifier="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102" hint="3102">
-    <iconEntry xmi:id="_x8Hbt2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbtmaNEeSyJIsxLao1Pw"
+      name="Broadcast Signal Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102"
+      hint="3102">
+    <iconEntry
+        xmi:id="_x8Hbt2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/BroadcastSignalAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.BroadcastSignalAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0d2aNEeSyJIsxLao1Pw" name="Call Behavior Action" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008" hint="3008">
-    <iconEntry xmi:id="_x8G0eGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0d2aNEeSyJIsxLao1Pw"
+      name="Call Behavior Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"
+      hint="3008">
+    <iconEntry
+        xmi:id="_x8G0eGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/CallBehaviorAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0gWaNEeSyJIsxLao1Pw" name="Call Operation Action" identifier="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010" hint="3010">
-    <iconEntry xmi:id="_x8G0gmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0gWaNEeSyJIsxLao1Pw"
+      name="Call Operation Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010"
+      hint="3010">
+    <iconEntry
+        xmi:id="_x8G0gmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/CallOperationAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbumaNEeSyJIsxLao1Pw" name="Central Buffer Node" identifier="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104" hint="3104">
-    <iconEntry xmi:id="_x8Hbu2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/CentralBufferNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbumaNEeSyJIsxLao1Pw"
+      name="Central Buffer Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104"
+      hint="3104">
+    <iconEntry
+        xmi:id="_x8Hbu2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/CentralBufferNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CentralBufferNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbjGaNEeSyJIsxLao1Pw" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.activity.Comment_3080" hint="3080">
-    <iconEntry xmi:id="_x8HbjWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbjGaNEeSyJIsxLao1Pw"
+      name="Comment"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Comment_3080"
+      hint="3080">
+    <iconEntry
+        xmi:id="_x8HbjWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbcmaNEeSyJIsxLao1Pw" name="Conditional Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069" hint="3069">
-    <iconEntry xmi:id="_x8Hbc2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ConditionalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbcmaNEeSyJIsxLao1Pw"
+      name="Conditional Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069"
+      hint="3069">
+    <iconEntry
+        xmi:id="_x8Hbc2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ConditionalNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ConditionalNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0Y2aNEeSyJIsxLao1Pw" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002" hint="3002">
-    <iconEntry xmi:id="_x8G0ZGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0Y2aNEeSyJIsxLao1Pw"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002"
+      hint="3002">
+    <iconEntry
+        xmi:id="_x8G0ZGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0ZWaNEeSyJIsxLao1Pw" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003" hint="3003">
-    <iconEntry xmi:id="_x8G0ZmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0ZWaNEeSyJIsxLao1Pw"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003"
+      hint="3003">
+    <iconEntry
+        xmi:id="_x8G0ZmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0nWaNEeSyJIsxLao1Pw" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011" hint="3011">
-    <iconEntry xmi:id="_x8G0nmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0nWaNEeSyJIsxLao1Pw"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011"
+      hint="3011">
+    <iconEntry
+        xmi:id="_x8G0nmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0n2aNEeSyJIsxLao1Pw" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012" hint="3012">
-    <iconEntry xmi:id="_x8G0oGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0n2aNEeSyJIsxLao1Pw"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012"
+      hint="3012">
+    <iconEntry
+        xmi:id="_x8G0oGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbvGaNEeSyJIsxLao1Pw" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112" hint="3112">
-    <iconEntry xmi:id="_x8HbvWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbvGaNEeSyJIsxLao1Pw"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112"
+      hint="3112">
+    <iconEntry
+        xmi:id="_x8HbvWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbwmaNEeSyJIsxLao1Pw" name="Control Flow" identifier="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004" hint="4004">
-    <iconEntry xmi:id="_x8Hbw2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbwmaNEeSyJIsxLao1Pw"
+      name="Control Flow"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004"
+      hint="4004">
+    <iconEntry
+        xmi:id="_x8Hbw2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ControlFlow.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Wjfh8OGmEeSvI9YIOwR8Lw" name="Create Link Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkObjectAction_3198" hint="3198">
-    <iconEntry xmi:id="_Wjfh8eGmEeSvI9YIOwR8Lw" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Wjfh8OGmEeSvI9YIOwR8Lw"
+      name="Create Link Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkObjectAction_3198"
+      hint="3198">
+    <iconEntry
+        xmi:id="_Wjfh8eGmEeSvI9YIOwR8Lw"
+        iconPath="/icons/full/obj16/CreateLinkObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HblGaNEeSyJIsxLao1Pw" name="Create Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086" hint="3086">
-    <iconEntry xmi:id="_x8HblWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/CreateObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HblGaNEeSyJIsxLao1Pw"
+      name="Create Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086"
+      hint="3086">
+    <iconEntry
+        xmi:id="_x8HblWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/CreateObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CreateObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0qWaNEeSyJIsxLao1Pw" name="Data Store Node" identifier="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078" hint="3078">
-    <iconEntry xmi:id="_x8G0qmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0qWaNEeSyJIsxLao1Pw"
+      name="Data Store Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078"
+      hint="3078">
+    <iconEntry
+        xmi:id="_x8G0qmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/DataStoreNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0oWaNEeSyJIsxLao1Pw" name="Decision Node" identifier="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038" hint="3038">
-    <iconEntry xmi:id="_x8G0omaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0oWaNEeSyJIsxLao1Pw"
+      name="Decision Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038"
+      hint="3038">
+    <iconEntry
+        xmi:id="_x8G0omaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/DecisionNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbqGaNEeSyJIsxLao1Pw" name="Destroy Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095" hint="3095">
-    <iconEntry xmi:id="_x8HbqWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/DestroyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbqGaNEeSyJIsxLao1Pw"
+      name="Destroy Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095"
+      hint="3095">
+    <iconEntry
+        xmi:id="_x8HbqWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/DestroyObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DestroyObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0kWaNEeSyJIsxLao1Pw" name="Duration Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034" hint="3034">
-    <iconEntry xmi:id="_x8G0kmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0kWaNEeSyJIsxLao1Pw"
+      name="Duration Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034"
+      hint="3034">
+    <iconEntry
+        xmi:id="_x8G0kmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/DurationConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0k2aNEeSyJIsxLao1Pw" name="Duration Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035" hint="3035">
-    <iconEntry xmi:id="_x8G0lGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0k2aNEeSyJIsxLao1Pw"
+      name="Duration Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035"
+      hint="3035">
+    <iconEntry
+        xmi:id="_x8G0lGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/DurationConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbxGaNEeSyJIsxLao1Pw" name="Exception Handler" identifier="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005" hint="4005">
-    <iconEntry xmi:id="_x8HbxWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExceptionHandler.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbxGaNEeSyJIsxLao1Pw"
+      name="Exception Handler"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005"
+      hint="4005">
+    <iconEntry
+        xmi:id="_x8HbxWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ExceptionHandler.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ExceptionHandler</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbdmaNEeSyJIsxLao1Pw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074" hint="3074">
-    <iconEntry xmi:id="_x8Hbd2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbdmaNEeSyJIsxLao1Pw"
+      name="Expansion Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074"
+      hint="3074">
+    <iconEntry
+        xmi:id="_x8Hbd2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ExpansionNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbeGaNEeSyJIsxLao1Pw" name="Expansion Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075" hint="3075">
-    <iconEntry xmi:id="_x8HbeWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbeGaNEeSyJIsxLao1Pw"
+      name="Expansion Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075"
+      hint="3075">
+    <iconEntry
+        xmi:id="_x8HbeWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ExpansionNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbdGaNEeSyJIsxLao1Pw" name="Expansion Region" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070" hint="3070">
-    <iconEntry xmi:id="_x8HbdWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbdGaNEeSyJIsxLao1Pw"
+      name="Expansion Region"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_x8HbdWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ExpansionRegion.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ExpansionRegion</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0a2aNEeSyJIsxLao1Pw" name="Flow Final Node" identifier="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006" hint="3006">
-    <iconEntry xmi:id="_x8G0bGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0a2aNEeSyJIsxLao1Pw"
+      name="Flow Final Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006"
+      hint="3006">
+    <iconEntry
+        xmi:id="_x8G0bGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/FlowFinalNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0pWaNEeSyJIsxLao1Pw" name="Fork Node" identifier="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040" hint="3040">
-    <iconEntry xmi:id="_x8G0pmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0pWaNEeSyJIsxLao1Pw"
+      name="Fork Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040"
+      hint="3040">
+    <iconEntry
+        xmi:id="_x8G0pmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ForkNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0Z2aNEeSyJIsxLao1Pw" name="Initial Node" identifier="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004" hint="3004">
-    <iconEntry xmi:id="_x8G0aGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0Z2aNEeSyJIsxLao1Pw"
+      name="Initial Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004"
+      hint="3004">
+    <iconEntry
+        xmi:id="_x8G0aGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InitialNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0c2aNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013" hint="3013">
-    <iconEntry xmi:id="_x8G0dGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0c2aNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013"
+      hint="3013">
+    <iconEntry
+        xmi:id="_x8G0dGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0fWaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019" hint="3019">
-    <iconEntry xmi:id="_x8G0fmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0fWaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019"
+      hint="3019">
+    <iconEntry
+        xmi:id="_x8G0fmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0h2aNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023" hint="3023">
-    <iconEntry xmi:id="_x8G0iGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0h2aNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023"
+      hint="3023">
+    <iconEntry
+        xmi:id="_x8G0iGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0j2aNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027" hint="3027">
-    <iconEntry xmi:id="_x8G0kGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0j2aNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027"
+      hint="3027">
+    <iconEntry
+        xmi:id="_x8G0kGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0sWaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048" hint="3048">
-    <iconEntry xmi:id="_x8G0smaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0sWaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048"
+      hint="3048">
+    <iconEntry
+        xmi:id="_x8G0smaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0t2aNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051" hint="3051">
-    <iconEntry xmi:id="_x8G0uGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0t2aNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051"
+      hint="3051">
+    <iconEntry
+        xmi:id="_x8G0uGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0v2aNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055" hint="3055">
-    <iconEntry xmi:id="_x8G0wGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0v2aNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055"
+      hint="3055">
+    <iconEntry
+        xmi:id="_x8G0wGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0xWaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062" hint="3062">
-    <iconEntry xmi:id="_x8G0xmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0xWaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062"
+      hint="3062">
+    <iconEntry
+        xmi:id="_x8G0xmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbnGaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089" hint="3089">
-    <iconEntry xmi:id="_x8HbnWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbnGaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089"
+      hint="3089">
+    <iconEntry
+        xmi:id="_x8HbnWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbomaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092" hint="3092">
-    <iconEntry xmi:id="_x8Hbo2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbomaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092"
+      hint="3092">
+    <iconEntry
+        xmi:id="_x8Hbo2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbpGaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093" hint="3093">
-    <iconEntry xmi:id="_x8HbpWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbpGaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093"
+      hint="3093">
+    <iconEntry
+        xmi:id="_x8HbpWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbqmaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096" hint="3096">
-    <iconEntry xmi:id="_x8Hbq2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbqmaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096"
+      hint="3096">
+    <iconEntry
+        xmi:id="_x8Hbq2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbsmaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100" hint="3100">
-    <iconEntry xmi:id="_x8Hbs2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbsmaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100"
+      hint="3100">
+    <iconEntry
+        xmi:id="_x8Hbs2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbtGaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101" hint="3101">
-    <iconEntry xmi:id="_x8HbtWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbtGaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_x8HbtWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbuGaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103" hint="3103">
-    <iconEntry xmi:id="_x8HbuWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbuGaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103"
+      hint="3103">
+    <iconEntry
+        xmi:id="_x8HbuWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbhmaNEeSyJIsxLao1Pw" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105" hint="3105">
-    <iconEntry xmi:id="_x8Hbh2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbhmaNEeSyJIsxLao1Pw"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105"
+      hint="3105">
+    <iconEntry
+        xmi:id="_x8Hbh2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbimaNEeSyJIsxLao1Pw" name="Interruptible Activity Region" identifier="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068" hint="3068">
-    <iconEntry xmi:id="_x8Hbi2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbimaNEeSyJIsxLao1Pw"
+      name="Interruptible Activity Region"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068"
+      hint="3068">
+    <iconEntry
+        xmi:id="_x8Hbi2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InterruptibleActivityRegion</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0mWaNEeSyJIsxLao1Pw" name="Interval Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032" hint="3032">
-    <iconEntry xmi:id="_x8G0mmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0mWaNEeSyJIsxLao1Pw"
+      name="Interval Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032"
+      hint="3032">
+    <iconEntry
+        xmi:id="_x8G0mmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/IntervalConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0m2aNEeSyJIsxLao1Pw" name="Interval Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033" hint="3033">
-    <iconEntry xmi:id="_x8G0nGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0m2aNEeSyJIsxLao1Pw"
+      name="Interval Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033"
+      hint="3033">
+    <iconEntry
+        xmi:id="_x8G0nGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/IntervalConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0p2aNEeSyJIsxLao1Pw" name="Join Node" identifier="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041" hint="3041">
-    <iconEntry xmi:id="_x8G0qGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0p2aNEeSyJIsxLao1Pw"
+      name="Join Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041"
+      hint="3041">
+    <iconEntry
+        xmi:id="_x8G0qGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/JoinNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbemaNEeSyJIsxLao1Pw" name="Loop Node" identifier="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071" hint="3071">
-    <iconEntry xmi:id="_x8Hbe2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbemaNEeSyJIsxLao1Pw"
+      name="Loop Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071"
+      hint="3071">
+    <iconEntry
+        xmi:id="_x8Hbe2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/LoopNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.LoopNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0o2aNEeSyJIsxLao1Pw" name="Merge Node" identifier="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039" hint="3039">
-    <iconEntry xmi:id="_x8G0pGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0o2aNEeSyJIsxLao1Pw"
+      name="Merge Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039"
+      hint="3039">
+    <iconEntry
+        xmi:id="_x8G0pGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/MergeNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbmGaNEeSyJIsxLao1Pw" name="Shape Named Element" identifier="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085" hint="3085">
-    <iconEntry xmi:id="_x8HbmWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbmGaNEeSyJIsxLao1Pw"
+      name="Shape Named Element"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_x8HbmWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/NamedElement.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbwGaNEeSyJIsxLao1Pw" name="Object Flow" identifier="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003" hint="4003">
-    <iconEntry xmi:id="_x8HbwWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbwGaNEeSyJIsxLao1Pw"
+      name="Object Flow"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003"
+      hint="4003">
+    <iconEntry
+        xmi:id="_x8HbwWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ObjectFlow.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0bWaNEeSyJIsxLao1Pw" name="Opaque Action" identifier="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007" hint="3007">
-    <iconEntry xmi:id="_x8G0bmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0bWaNEeSyJIsxLao1Pw"
+      name="Opaque Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007"
+      hint="3007">
+    <iconEntry
+        xmi:id="_x8G0bmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OpaqueAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0dWaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014" hint="3014">
-    <iconEntry xmi:id="_x8G0dmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0dWaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014"
+      hint="3014">
+    <iconEntry
+        xmi:id="_x8G0dmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0f2aNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020" hint="3020">
-    <iconEntry xmi:id="_x8G0gGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0f2aNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020"
+      hint="3020">
+    <iconEntry
+        xmi:id="_x8G0gGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0iWaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024" hint="3024">
-    <iconEntry xmi:id="_x8G0imaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0iWaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024"
+      hint="3024">
+    <iconEntry
+        xmi:id="_x8G0imaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0y2aNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064" hint="3064">
-    <iconEntry xmi:id="_x8G0zGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0y2aNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064"
+      hint="3064">
+    <iconEntry
+        xmi:id="_x8G0zGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbcGaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077" hint="3077">
-    <iconEntry xmi:id="_x8HbcWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbcGaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077"
+      hint="3077">
+    <iconEntry
+        xmi:id="_x8HbcWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbkGaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084" hint="3084">
-    <iconEntry xmi:id="_x8HbkWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbkGaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084"
+      hint="3084">
+    <iconEntry
+        xmi:id="_x8HbkWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HblmaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087" hint="3087">
-    <iconEntry xmi:id="_x8Hbl2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HblmaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087"
+      hint="3087">
+    <iconEntry
+        xmi:id="_x8Hbl2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbnmaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090" hint="3090">
-    <iconEntry xmi:id="_x8Hbn2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbnmaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090"
+      hint="3090">
+    <iconEntry
+        xmi:id="_x8Hbn2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbpmaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094" hint="3094">
-    <iconEntry xmi:id="_x8Hbp2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbpmaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094"
+      hint="3094">
+    <iconEntry
+        xmi:id="_x8Hbp2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbrmaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098" hint="3098">
-    <iconEntry xmi:id="_x8Hbr2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbrmaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098"
+      hint="3098">
+    <iconEntry
+        xmi:id="_x8Hbr2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbfGaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109" hint="3109">
-    <iconEntry xmi:id="_x8HbfWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbfGaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109"
+      hint="3109">
+    <iconEntry
+        xmi:id="_x8HbfWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbfmaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110" hint="3110">
-    <iconEntry xmi:id="_x8Hbf2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbfmaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110"
+      hint="3110">
+    <iconEntry
+        xmi:id="_x8Hbf2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbgGaNEeSyJIsxLao1Pw" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111" hint="3111">
-    <iconEntry xmi:id="_x8HbgWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbgGaNEeSyJIsxLao1Pw"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111"
+      hint="3111">
+    <iconEntry
+        xmi:id="_x8HbgWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0YWaNEeSyJIsxLao1Pw" name="Parameter" identifier="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001" hint="3001">
-    <iconEntry xmi:id="_x8G0YmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0YWaNEeSyJIsxLao1Pw"
+      name="Parameter"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001"
+      hint="3001">
+    <iconEntry
+        xmi:id="_x8G0YmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/Parameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbjmaNEeSyJIsxLao1Pw" name="Read Self Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081" hint="3081">
-    <iconEntry xmi:id="_x8Hbj2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ReadSelfAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbjmaNEeSyJIsxLao1Pw"
+      name="Read Self Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081"
+      hint="3081">
+    <iconEntry
+        xmi:id="_x8Hbj2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ReadSelfAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadSelfAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbmmaNEeSyJIsxLao1Pw" name="Read Structural Feature Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088" hint="3088">
-    <iconEntry xmi:id="_x8Hbm2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbmmaNEeSyJIsxLao1Pw"
+      name="Read Structural Feature Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088"
+      hint="3088">
+    <iconEntry
+        xmi:id="_x8Hbm2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadStructuralFeatureAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbrGaNEeSyJIsxLao1Pw" name="Read Variable Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097" hint="3097">
-    <iconEntry xmi:id="_x8HbrWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ReadVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbrGaNEeSyJIsxLao1Pw"
+      name="Read Variable Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097"
+      hint="3097">
+    <iconEntry
+        xmi:id="_x8HbrWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ReadVariableAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadVariableAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0q2aNEeSyJIsxLao1Pw" name="Send Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042" hint="3042">
-    <iconEntry xmi:id="_x8G0rGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0q2aNEeSyJIsxLao1Pw"
+      name="Send Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042"
+      hint="3042">
+    <iconEntry
+        xmi:id="_x8G0rGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/SendObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.SendObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0uWaNEeSyJIsxLao1Pw" name="Send Signal Action" identifier="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052" hint="3052">
-    <iconEntry xmi:id="_x8G0umaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/SendSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0uWaNEeSyJIsxLao1Pw"
+      name="Send Signal Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052"
+      hint="3052">
+    <iconEntry
+        xmi:id="_x8G0umaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/SendSignalAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.SendSignalAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbgmaNEeSyJIsxLao1Pw" name="Sequence Node" identifier="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073" hint="3073">
-    <iconEntry xmi:id="_x8Hbg2aNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/SequenceNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbgmaNEeSyJIsxLao1Pw"
+      name="Sequence Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073"
+      hint="3073">
+    <iconEntry
+        xmi:id="_x8Hbg2aNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/SequenceNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.SequenceNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8HbhGaNEeSyJIsxLao1Pw" name="Structured Activity Node" identifier="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065" hint="3065">
-    <iconEntry xmi:id="_x8HbhWaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8HbhGaNEeSyJIsxLao1Pw"
+      name="Structured Activity Node"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065"
+      hint="3065">
+    <iconEntry
+        xmi:id="_x8HbhWaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/StructuredActivityNode.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0lWaNEeSyJIsxLao1Pw" name="Time Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036" hint="3036">
-    <iconEntry xmi:id="_x8G0lmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0lWaNEeSyJIsxLao1Pw"
+      name="Time Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036"
+      hint="3036">
+    <iconEntry
+        xmi:id="_x8G0lmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/TimeConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0l2aNEeSyJIsxLao1Pw" name="Time Constraint" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037" hint="3037">
-    <iconEntry xmi:id="_x8G0mGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0l2aNEeSyJIsxLao1Pw"
+      name="Time Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037"
+      hint="3037">
+    <iconEntry
+        xmi:id="_x8G0mGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/TimeConstraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0b2aNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015" hint="3015">
-    <iconEntry xmi:id="_x8G0cGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0b2aNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015"
+      hint="3015">
+    <iconEntry
+        xmi:id="_x8G0cGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0eWaNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017" hint="3017">
-    <iconEntry xmi:id="_x8G0emaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0eWaNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017"
+      hint="3017">
+    <iconEntry
+        xmi:id="_x8G0emaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0hWaNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022" hint="3022">
-    <iconEntry xmi:id="_x8G0hmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0hWaNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022"
+      hint="3022">
+    <iconEntry
+        xmi:id="_x8G0hmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0i2aNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025" hint="3025">
-    <iconEntry xmi:id="_x8G0jGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0i2aNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025"
+      hint="3025">
+    <iconEntry
+        xmi:id="_x8G0jGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0rWaNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046" hint="3046">
-    <iconEntry xmi:id="_x8G0rmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0rWaNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046"
+      hint="3046">
+    <iconEntry
+        xmi:id="_x8G0rmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0s2aNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049" hint="3049">
-    <iconEntry xmi:id="_x8G0tGaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0s2aNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049"
+      hint="3049">
+    <iconEntry
+        xmi:id="_x8G0tGaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0vWaNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054" hint="3054">
-    <iconEntry xmi:id="_x8G0vmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0vWaNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054"
+      hint="3054">
+    <iconEntry
+        xmi:id="_x8G0vmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0wWaNEeSyJIsxLao1Pw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060" hint="3060">
-    <iconEntry xmi:id="_x8G0wmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0wWaNEeSyJIsxLao1Pw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060"
+      hint="3060">
+    <iconEntry
+        xmi:id="_x8G0wmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0zWaNEeSyJIsxLao1Pw" name="Value Specification Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076" hint="3076">
-    <iconEntry xmi:id="_x8G0zmaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_x8G0zWaNEeSyJIsxLao1Pw"
+      name="Value Specification Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076"
+      hint="3076">
+    <iconEntry
+        xmi:id="_x8G0zmaNEeSyJIsxLao1Pw"
+        iconPath="/icons/full/obj16/ValueSpecificationAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValueSpecificationAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_q-4csL02EeSUmeqld4lnBQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.activity.Package_1000" hint="PapyrusUMLActivityDiagram">
-    <iconEntry xmi:id="_q-5DwL02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_q-4csL02EeSUmeqld4lnBQ"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.Package_1000"
+      hint="PapyrusUMLActivityDiagram">
+    <iconEntry
+        xmi:id="_q-5DwL02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAPHkL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3192" hint="3192">
-    <iconEntry xmi:id="_rAPHkb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAPHkL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3192"
+      hint="3192">
+    <iconEntry
+        xmi:id="_rAPHkb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAPuoL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3193" hint="3193">
-    <iconEntry xmi:id="_rAPuob02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAPuoL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3193"
+      hint="3193">
+    <iconEntry
+        xmi:id="_rAPuob02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAVOML02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3188" hint="3188">
-    <iconEntry xmi:id="_rAVOMb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAVOML02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3188"
+      hint="3188">
+    <iconEntry
+        xmi:id="_rAVOMb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAWcUL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3189" hint="3189">
-    <iconEntry xmi:id="_rAWcUb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAWcUL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3189"
+      hint="3189">
+    <iconEntry
+        xmi:id="_rAWcUb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_9dDiROsXEeS3WOZTeAfQLw" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3203" hint="3203">
-    <iconEntry xmi:id="_9dDiResXEeS3WOZTeAfQLw" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_9dDiROsXEeS3WOZTeAfQLw"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3203"
+      hint="3203">
+    <iconEntry
+        xmi:id="_9dDiResXEeS3WOZTeAfQLw"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAXqcL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3190" hint="3190">
-    <iconEntry xmi:id="_rAXqcb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAXqcL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3190"
+      hint="3190">
+    <iconEntry
+        xmi:id="_rAXqcb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAYRgL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191" hint="3191">
-    <iconEntry xmi:id="_rAYRgb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAYRgL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191"
+      hint="3191">
+    <iconEntry
+        xmi:id="_rAYRgb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAm7AL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3181" hint="3181">
-    <iconEntry xmi:id="_rAm7Ab02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAm7AL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3181"
+      hint="3181">
+    <iconEntry
+        xmi:id="_rAm7Ab02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAoJIL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3182" hint="3182">
-    <iconEntry xmi:id="_rAoJIb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAoJIL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3182"
+      hint="3182">
+    <iconEntry
+        xmi:id="_rAoJIb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAowML02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3183" hint="3183">
-    <iconEntry xmi:id="_rAowMb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAowML02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3183"
+      hint="3183">
+    <iconEntry
+        xmi:id="_rAowMb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAp-UL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3184" hint="3184">
-    <iconEntry xmi:id="_rAp-Ub02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAp-UL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3184"
+      hint="3184">
+    <iconEntry
+        xmi:id="_rAp-Ub02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rArMcL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3185" hint="3185">
-    <iconEntry xmi:id="_rArMcb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rArMcL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3185"
+      hint="3185">
+    <iconEntry
+        xmi:id="_rArMcb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rArzgL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3186" hint="3186">
-    <iconEntry xmi:id="_rArzgb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rArzgL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3186"
+      hint="3186">
+    <iconEntry
+        xmi:id="_rArzgb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAtBoL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3187" hint="3187">
-    <iconEntry xmi:id="_rAtBob02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAtBoL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3187"
+      hint="3187">
+    <iconEntry
+        xmi:id="_rAtBob02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAwsAL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3173" hint="3173">
-    <iconEntry xmi:id="_rAwsAb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAwsAL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3173"
+      hint="3173">
+    <iconEntry
+        xmi:id="_rAwsAb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rAxTEL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3174" hint="3174">
-    <iconEntry xmi:id="_rAxTEb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rAxTEL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3174"
+      hint="3174">
+    <iconEntry
+        xmi:id="_rAxTEb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA3ZsL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3175" hint="3175">
-    <iconEntry xmi:id="_rA3Zsb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA3ZsL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3175"
+      hint="3175">
+    <iconEntry
+        xmi:id="_rA3Zsb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA4AwL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3176" hint="3176">
-    <iconEntry xmi:id="_rA4Awb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA4AwL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3176"
+      hint="3176">
+    <iconEntry
+        xmi:id="_rA4Awb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA5O4L02EeSUmeqld4lnBQ" name="Actoin Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActoinInputPin_3177" hint="3177">
-    <iconEntry xmi:id="_rA5O4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA5O4L02EeSUmeqld4lnBQ"
+      name="Actoin Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActoinInputPin_3177"
+      hint="3177">
+    <iconEntry
+        xmi:id="_rA5O4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA518L02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3178" hint="3178">
-    <iconEntry xmi:id="_rA518b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA518L02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3178"
+      hint="3178">
+    <iconEntry
+        xmi:id="_rA518b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA85QL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3179" hint="3179">
-    <iconEntry xmi:id="_rA85Qb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA85QL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3179"
+      hint="3179">
+    <iconEntry
+        xmi:id="_rA85Qb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rA-HYL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3180" hint="3180">
-    <iconEntry xmi:id="_rA-HYb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rA-HYL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3180"
+      hint="3180">
+    <iconEntry
+        xmi:id="_rA-HYb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBAjoL02EeSUmeqld4lnBQ" name="Start Object Behaviour Action" identifier="org.eclipse.papyrus.uml.diagram.activity.StartObjectBehaviorAction_3113" hint="3113">
-    <iconEntry xmi:id="_rBAjob02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBAjoL02EeSUmeqld4lnBQ"
+      name="Start Object Behaviour Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.StartObjectBehaviorAction_3113"
+      hint="3113">
+    <iconEntry
+        xmi:id="_rBAjob02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.StartObjectBehaviorAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBBxwL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125" hint="3125">
-    <iconEntry xmi:id="_rBBxwb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBBxwL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125"
+      hint="3125">
+    <iconEntry
+        xmi:id="_rBBxwb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBC_4L02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3132" hint="3132">
-    <iconEntry xmi:id="_rBC_4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBC_4L02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3132"
+      hint="3132">
+    <iconEntry
+        xmi:id="_rBC_4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBDm8L02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3145" hint="3145">
-    <iconEntry xmi:id="_rBDm8b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBDm8L02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3145"
+      hint="3145">
+    <iconEntry
+        xmi:id="_rBDm8b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBE1EL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3158" hint="3158">
-    <iconEntry xmi:id="_rBE1Eb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBE1EL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3158"
+      hint="3158">
+    <iconEntry
+        xmi:id="_rBE1Eb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBFcIL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3133" hint="3133">
-    <iconEntry xmi:id="_rBGDML02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBFcIL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3133"
+      hint="3133">
+    <iconEntry
+        xmi:id="_rBGDML02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBGqQL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3146" hint="3146">
-    <iconEntry xmi:id="_rBGqQb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBGqQL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3146"
+      hint="3146">
+    <iconEntry
+        xmi:id="_rBGqQb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBH4YL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3159" hint="3159">
-    <iconEntry xmi:id="_rBH4Yb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBH4YL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3159"
+      hint="3159">
+    <iconEntry
+        xmi:id="_rBH4Yb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBIfcL02EeSUmeqld4lnBQ" name="Test Identity Action" identifier="org.eclipse.papyrus.uml.diagram.activity.TestIdentityAction_3114" hint="3114">
-    <iconEntry xmi:id="_rBIfcb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/TestIdentityAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBIfcL02EeSUmeqld4lnBQ"
+      name="Test Identity Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.TestIdentityAction_3114"
+      hint="3114">
+    <iconEntry
+        xmi:id="_rBIfcb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/TestIdentityAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.TestIdentityAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBJtkL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126" hint="3126">
-    <iconEntry xmi:id="_rBJtkb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBJtkL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126"
+      hint="3126">
+    <iconEntry
+        xmi:id="_rBJtkb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBK7sL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3134" hint="3134">
-    <iconEntry xmi:id="_rBK7sb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBK7sL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3134"
+      hint="3134">
+    <iconEntry
+        xmi:id="_rBK7sb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBMJ0L02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3135" hint="3135">
-    <iconEntry xmi:id="_rBMJ0b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBMJ0L02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3135"
+      hint="3135">
+    <iconEntry
+        xmi:id="_rBMJ0b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBMw4L02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3147" hint="3147">
-    <iconEntry xmi:id="_rBMw4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBMw4L02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3147"
+      hint="3147">
+    <iconEntry
+        xmi:id="_rBMw4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBN_AL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3148" hint="3148">
-    <iconEntry xmi:id="_rBN_Ab02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBN_AL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3148"
+      hint="3148">
+    <iconEntry
+        xmi:id="_rBN_Ab02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBPNIL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3160" hint="3160">
-    <iconEntry xmi:id="_rBPNIb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBPNIL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3160"
+      hint="3160">
+    <iconEntry
+        xmi:id="_rBPNIb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBQbQL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3161" hint="3161">
-    <iconEntry xmi:id="_rBQbQb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBQbQL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3161"
+      hint="3161">
+    <iconEntry
+        xmi:id="_rBQbQb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBRCUL02EeSUmeqld4lnBQ" name="Clear Structural Feature Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearStructuralFeatureAction_3115" hint="3115">
-    <iconEntry xmi:id="_rBRCUb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBRCUL02EeSUmeqld4lnBQ"
+      name="Clear Structural Feature Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ClearStructuralFeatureAction_3115"
+      hint="3115">
+    <iconEntry
+        xmi:id="_rBRCUb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ClearStructuralFeatureAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBSQcL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127" hint="3127">
-    <iconEntry xmi:id="_rBSQcb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBSQcL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127"
+      hint="3127">
+    <iconEntry
+        xmi:id="_rBSQcb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBTekL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3136" hint="3136">
-    <iconEntry xmi:id="_rBTekb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBTekL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3136"
+      hint="3136">
+    <iconEntry
+        xmi:id="_rBTekb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBUssL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3149" hint="3149">
-    <iconEntry xmi:id="_rBUssb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBUssL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3149"
+      hint="3149">
+    <iconEntry
+        xmi:id="_rBUssb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBVTwL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3162" hint="3162">
-    <iconEntry xmi:id="_rBVTwb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBVTwL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3162"
+      hint="3162">
+    <iconEntry
+        xmi:id="_rBVTwb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBWh4L02EeSUmeqld4lnBQ" name="Create Link Action" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkAction_3117" hint="3117">
-    <iconEntry xmi:id="_rBWh4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/CreateLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBWh4L02EeSUmeqld4lnBQ"
+      name="Create Link Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkAction_3117"
+      hint="3117">
+    <iconEntry
+        xmi:id="_rBWh4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/CreateLinkAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBXwAL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3137" hint="3137">
-    <iconEntry xmi:id="_rBXwAb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBXwAL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3137"
+      hint="3137">
+    <iconEntry
+        xmi:id="_rBXwAb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBY-IL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3151" hint="3151">
-    <iconEntry xmi:id="_rBY-Ib02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBY-IL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3151"
+      hint="3151">
+    <iconEntry
+        xmi:id="_rBY-Ib02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBZlML02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3163" hint="3163">
-    <iconEntry xmi:id="_rBZlMb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBZlML02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3163"
+      hint="3163">
+    <iconEntry
+        xmi:id="_rBZlMb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBazUL02EeSUmeqld4lnBQ" name="Read Link Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadLinkAction_3116" hint="3116">
-    <iconEntry xmi:id="_rBazUb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ReadLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBazUL02EeSUmeqld4lnBQ"
+      name="Read Link Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadLinkAction_3116"
+      hint="3116">
+    <iconEntry
+        xmi:id="_rBazUb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ReadLinkAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadLinkAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBcBcL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128" hint="3128">
-    <iconEntry xmi:id="_rBcBcb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBcBcL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128"
+      hint="3128">
+    <iconEntry
+        xmi:id="_rBcBcb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBdPkL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3138" hint="3138">
-    <iconEntry xmi:id="_rBdPkb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBdPkL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3138"
+      hint="3138">
+    <iconEntry
+        xmi:id="_rBdPkb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBedsL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3150" hint="3150">
-    <iconEntry xmi:id="_rBedsb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBedsL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3150"
+      hint="3150">
+    <iconEntry
+        xmi:id="_rBedsb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBfEwL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3164" hint="3164">
-    <iconEntry xmi:id="_rBfEwb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBfEwL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3164"
+      hint="3164">
+    <iconEntry
+        xmi:id="_rBfEwb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBgS4L02EeSUmeqld4lnBQ" name="Destroy Link Action" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyLinkAction_3118" hint="3118">
-    <iconEntry xmi:id="_rBgS4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/DestroyLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBgS4L02EeSUmeqld4lnBQ"
+      name="Destroy Link Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyLinkAction_3118"
+      hint="3118">
+    <iconEntry
+        xmi:id="_rBgS4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/DestroyLinkAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.DestroyLinkAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBhhAL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3139" hint="3139">
-    <iconEntry xmi:id="_rBhhAb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBhhAL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3139"
+      hint="3139">
+    <iconEntry
+        xmi:id="_rBhhAb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBivIL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3152" hint="3152">
-    <iconEntry xmi:id="_rBivIb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBivIL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3152"
+      hint="3152">
+    <iconEntry
+        xmi:id="_rBivIb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBjWML02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3165" hint="3165">
-    <iconEntry xmi:id="_rBjWMb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBjWML02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3165"
+      hint="3165">
+    <iconEntry
+        xmi:id="_rBjWMb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBkkUL02EeSUmeqld4lnBQ" name="Clear Assotiation Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearAssociationAction_3119" hint="3119">
-    <iconEntry xmi:id="_rBkkUb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ClearAssociationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBkkUL02EeSUmeqld4lnBQ"
+      name="Clear Assotiation Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ClearAssociationAction_3119"
+      hint="3119">
+    <iconEntry
+        xmi:id="_rBkkUb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ClearAssociationAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ClearAssociationAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBlycL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3140" hint="3140">
-    <iconEntry xmi:id="_rBlycb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBlycL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3140"
+      hint="3140">
+    <iconEntry
+        xmi:id="_rBlycb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBmZgL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3153" hint="3153">
-    <iconEntry xmi:id="_rBmZgb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBmZgL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3153"
+      hint="3153">
+    <iconEntry
+        xmi:id="_rBmZgb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBnnoL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3166" hint="3166">
-    <iconEntry xmi:id="_rBnnob02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBnnoL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3166"
+      hint="3166">
+    <iconEntry
+        xmi:id="_rBnnob02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBo1wL02EeSUmeqld4lnBQ" name="Read Extent Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadExtentAction_3120" hint="3120">
-    <iconEntry xmi:id="_rBo1wb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ReadExtentAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBo1wL02EeSUmeqld4lnBQ"
+      name="Read Extent Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadExtentAction_3120"
+      hint="3120">
+    <iconEntry
+        xmi:id="_rBo1wb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ReadExtentAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadExtentAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBqD4L02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129" hint="3129">
-    <iconEntry xmi:id="_rBqD4b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBqD4L02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129"
+      hint="3129">
+    <iconEntry
+        xmi:id="_rBqD4b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBqq8L02EeSUmeqld4lnBQ" name="Reclassify Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReclassifyObjectAction_3121" hint="3121">
-    <iconEntry xmi:id="_rBqq8b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBqq8L02EeSUmeqld4lnBQ"
+      name="Reclassify Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReclassifyObjectAction_3121"
+      hint="3121">
+    <iconEntry
+        xmi:id="_rBqq8b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ReclassifyObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReclassifyObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBr5EL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3141" hint="3141">
-    <iconEntry xmi:id="_rBr5Eb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBr5EL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3141"
+      hint="3141">
+    <iconEntry
+        xmi:id="_rBr5Eb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBtHML02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3154" hint="3154">
-    <iconEntry xmi:id="_rBtHMb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBtHML02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3154"
+      hint="3154">
+    <iconEntry
+        xmi:id="_rBtHMb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBtuQL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3167" hint="3167">
-    <iconEntry xmi:id="_rBuVUL02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBtuQL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3167"
+      hint="3167">
+    <iconEntry
+        xmi:id="_rBuVUL02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBu8YL02EeSUmeqld4lnBQ" name="Read Is Classified Object Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadIsClassifiedObjectAction_3122" hint="3122">
-    <iconEntry xmi:id="_rBu8Yb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBu8YL02EeSUmeqld4lnBQ"
+      name="Read Is Classified Object Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReadIsClassifiedObjectAction_3122"
+      hint="3122">
+    <iconEntry
+        xmi:id="_rBu8Yb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBwKgL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130" hint="3130">
-    <iconEntry xmi:id="_rBwKgb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBwKgL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130"
+      hint="3130">
+    <iconEntry
+        xmi:id="_rBwKgb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBxYoL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3142" hint="3142">
-    <iconEntry xmi:id="_rBxYob02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBxYoL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3142"
+      hint="3142">
+    <iconEntry
+        xmi:id="_rBxYob02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBx_sL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3155" hint="3155">
-    <iconEntry xmi:id="_rBx_sb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBx_sL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3155"
+      hint="3155">
+    <iconEntry
+        xmi:id="_rBx_sb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBzN0L02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3168" hint="3168">
-    <iconEntry xmi:id="_rBzN0b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBzN0L02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3168"
+      hint="3168">
+    <iconEntry
+        xmi:id="_rBzN0b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rBz04L02EeSUmeqld4lnBQ" name="Reduce Action" identifier="org.eclipse.papyrus.uml.diagram.activity.ReduceAction_3123" hint="3123">
-    <iconEntry xmi:id="_rBz04b02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ReduceAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rBz04L02EeSUmeqld4lnBQ"
+      name="Reduce Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ReduceAction_3123"
+      hint="3123">
+    <iconEntry
+        xmi:id="_rBz04b02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ReduceAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ReduceAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB1DAL02EeSUmeqld4lnBQ" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131" hint="3131">
-    <iconEntry xmi:id="_rB1DAb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB1DAL02EeSUmeqld4lnBQ"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131"
+      hint="3131">
+    <iconEntry
+        xmi:id="_rB1DAb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_gx2kouGsEeSijulVpZaadA" name="Output Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202" hint="3202">
-    <iconEntry xmi:id="_gx2ko-GsEeSijulVpZaadA" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_gx2kouGsEeSijulVpZaadA"
+      name="Output Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202"
+      hint="3202">
+    <iconEntry
+        xmi:id="_gx2ko-GsEeSijulVpZaadA"
+        iconPath="/icons/full/obj16/OutputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB2RIL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3143" hint="3143">
-    <iconEntry xmi:id="_rB2RIb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB2RIL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3143"
+      hint="3143">
+    <iconEntry
+        xmi:id="_rB2RIb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB24ML02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3156" hint="3156">
-    <iconEntry xmi:id="_rB24Mb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB24ML02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3156"
+      hint="3156">
+    <iconEntry
+        xmi:id="_rB24Mb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB4GUL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3169" hint="3169">
-    <iconEntry xmi:id="_rB4GUb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB4GUL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3169"
+      hint="3169">
+    <iconEntry
+        xmi:id="_rB4GUb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB4tYL02EeSUmeqld4lnBQ" name="Start Classifier Behaviour Action" identifier="org.eclipse.papyrus.uml.diagram.activity.StartClassifierBehaviorAction_3124" hint="3124">
-    <iconEntry xmi:id="_rB4tYb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB4tYL02EeSUmeqld4lnBQ"
+      name="Start Classifier Behaviour Action"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.StartClassifierBehaviorAction_3124"
+      hint="3124">
+    <iconEntry
+        xmi:id="_rB4tYb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.StartClassifierBehaviorAction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB57gL02EeSUmeqld4lnBQ" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3144" hint="3144">
-    <iconEntry xmi:id="_rB57gb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB57gL02EeSUmeqld4lnBQ"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3144"
+      hint="3144">
+    <iconEntry
+        xmi:id="_rB57gb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_gx19kOGsEeSijulVpZaadA" name="Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3199" hint="3199">
-    <iconEntry xmi:id="_gx19keGsEeSijulVpZaadA" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_gx19kOGsEeSijulVpZaadA"
+      name="Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3199"
+      hint="3199">
+    <iconEntry
+        xmi:id="_gx19keGsEeSijulVpZaadA"
+        iconPath="/icons/full/obj16/InputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB6ikL02EeSUmeqld4lnBQ" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3157" hint="3157">
-    <iconEntry xmi:id="_rB6ikb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB6ikL02EeSUmeqld4lnBQ"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3157"
+      hint="3157">
+    <iconEntry
+        xmi:id="_rB6ikb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_gx19kuGsEeSijulVpZaadA" name="Value Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3200" hint="3200">
-    <iconEntry xmi:id="_gx19k-GsEeSijulVpZaadA" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_gx19kuGsEeSijulVpZaadA"
+      name="Value Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3200"
+      hint="3200">
+    <iconEntry
+        xmi:id="_gx19k-GsEeSijulVpZaadA"
+        iconPath="/icons/full/obj16/ValuePin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB7wsL02EeSUmeqld4lnBQ" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3170" hint="3170">
-    <iconEntry xmi:id="_rB7wsb02EeSUmeqld4lnBQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB7wsL02EeSUmeqld4lnBQ"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3170"
+      hint="3170">
+    <iconEntry
+        xmi:id="_rB7wsb02EeSUmeqld4lnBQ"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_gx2koOGsEeSijulVpZaadA" name="Action Input Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3201" hint="3201">
-    <iconEntry xmi:id="_gx2koeGsEeSijulVpZaadA" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_gx2koOGsEeSijulVpZaadA"
+      name="Action Input Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3201"
+      hint="3201">
+    <iconEntry
+        xmi:id="_gx2koeGsEeSijulVpZaadA"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB8-0L02EeSUmeqld4lnBQ" name="Action Local Precondition" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPrecondition_4001" hint="4001">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB8-0L02EeSUmeqld4lnBQ"
+      name="Action Local Precondition"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPrecondition_4001"
+      hint="4001">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_9dEJUOsXEeS3WOZTeAfQLw" name="Action Pin" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionPin_3204" hint="3204">
-    <iconEntry xmi:id="_9dEJUesXEeS3WOZTeAfQLw" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_9dEJUOsXEeS3WOZTeAfQLw"
+      name="Action Pin"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionPin_3204"
+      hint="3204">
+    <iconEntry
+        xmi:id="_9dEJUesXEeS3WOZTeAfQLw"
+        iconPath="/icons/full/obj16/ActionInputPin.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rB8-0b02EeSUmeqld4lnBQ" name="Action Local Postcondition" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPostcondition_4002" hint="4002">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rB8-0b02EeSUmeqld4lnBQ"
+      name="Action Local Postcondition"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPostcondition_4002"
+      hint="4002">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rCACIL02EeSUmeqld4lnBQ" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006" hint="4006">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rCACIL02EeSUmeqld4lnBQ"
+      name="Comment Annotated Element"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006"
+      hint="4006">
     <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rCACIb02EeSUmeqld4lnBQ" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.activity.ConstraintConstrainedElement_4007" hint="4007">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rCACIb02EeSUmeqld4lnBQ"
+      name="Constraint Constrained Element"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.ConstraintConstrainedElement_4007"
+      hint="4007">
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_N5AjYOnQEeSdwvyVD4uXcQ" name="Call Behavior Action Base" description="" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType">
-    <iconEntry xmi:id="_N5AjYenQEeSdwvyVD4uXcQ" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_N5AjYOnQEeSdwvyVD4uXcQ"
+      name="Call Behavior Action Base"
+      description=""
+      identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType">
+    <iconEntry
+        xmi:id="_N5AjYenQEeSdwvyVD4uXcQ"
+        iconPath="/icons/full/obj16/CallBehaviorAction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.CallBehaviorAction</specializedTypesID>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" target="_x8G0d2aNEeSyJIsxLao1Pw"/>
-  <adviceBindingsConfigurations xmi:id="_9UmhMGaOEeSyJIsxLao1Pw" name="" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" target="_x8G0gWaNEeSyJIsxLao1Pw"/>
-  <adviceBindingsConfigurations xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" target="_x8G0uWaNEeSyJIsxLao1Pw"/>
+  <adviceBindingsConfigurations
+      xmi:id="_zAcw0GaOEeSyJIsxLao1Pw"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice"
+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice"
+      target="_x8G0d2aNEeSyJIsxLao1Pw"/>
+  <adviceBindingsConfigurations
+      xmi:id="_9UmhMGaOEeSyJIsxLao1Pw"
+      name=""
+      identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice"
+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice"
+      inheritance="all"
+      target="_x8G0gWaNEeSyJIsxLao1Pw"/>
+  <adviceBindingsConfigurations
+      xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw"
+      identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice"
+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice"
+      inheritance="all"
+      target="_x8G0uWaNEeSyJIsxLao1Pw"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
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 70fe5585bf6..d69cd747257 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
@@ -3320,7 +3320,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet"
+   		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/activityDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
index 1b7ed3365ea..6b278c13795 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_rWOX8XPzEeSnGJwaJWHCSg" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rWOX8nPzEeSnGJwaJWHCSg" name="AssociationClassDashedLink" identifier="org.eclipse.papyrus.uml.diagram.clazz.Link_4016" hint="4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_rWOX8XPzEeSnGJwaJWHCSg"

+    name="PapyrusUMLClassDiagramNotation"

+    identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSetNotation"

+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_rWOX8nPzEeSnGJwaJWHCSg"

+      name="AssociationClassDashedLink"

+      identifier="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"

+      hint="4016"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
index 96b4bc6b33f..aacaddd596d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
@@ -7,7 +7,7 @@
     xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"
     name="PapyrusUMLClassDiagram"
     description=""
-    identifier=""
+    identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
@@ -1206,7 +1206,7 @@
       inheritance="all">
     <target
         xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-        href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/>
+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/>
   </adviceBindingsConfigurations>
   <adviceBindingsConfigurations
       xmi:id="_VPE3UJpvEeWZOI1l_xp4vg"
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 fab8447e2ad..12a90d38268 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
@@ -1715,14 +1715,14 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet"
+         clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/classdiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSetNotation"
+   		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/classdiagram-notation.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
index 0edcb694e36..c786b142cab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_XB3QgM2QEeSF96aioTD1kQ" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB33kc2QEeSF96aioTD1kQ" name="InterfacePortLink" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4018" hint="4018" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_XB3QgM2QEeSF96aioTD1kQ"

+    name="elementTypeSetNotation"

+    description=""

+    identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSetNotation"

+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XB33kc2QEeSF96aioTD1kQ"

+      name="InterfacePortLink"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Link_4018"

+      hint="4018"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB33kM2QEeSF96aioTD1kQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4016" hint="4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XB33kM2QEeSF96aioTD1kQ"

+      name="Undefined"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Link_4016"

+      hint="4016"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
index ca92d4543cb..1f524338c53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
@@ -1,141 +1,423 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_WyQuQM2QEeSF96aioTD1kQ" name="PapyrusUMLComponentDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBmx0M2QEeSF96aioTD1kQ" name="Abstraction" identifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013" hint="4013">

-    <iconEntry xmi:id="_XBmx0c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_WyQuQM2QEeSF96aioTD1kQ"

+    name="PapyrusUMLComponentDiagram"

+    identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSet"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBmx0M2QEeSF96aioTD1kQ"

+      name="Abstraction"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013"

+      hint="4013">

+    <iconEntry

+        xmi:id="_XBmx0c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Abstraction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_wXsM2QEeSF96aioTD1kQ" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074" hint="3074">

-    <iconEntry xmi:id="_W_w-wM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_wXsM2QEeSF96aioTD1kQ"

+      name="Comment"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074"

+      hint="3074">

+    <iconEntry

+        xmi:id="_W_w-wM2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Comment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAwdQM2QEeSF96aioTD1kQ" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201" hint="3201">

-    <iconEntry xmi:id="_XAxEUM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAwdQM2QEeSF96aioTD1kQ"

+      name="Comment"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201"

+      hint="3201">

+    <iconEntry

+        xmi:id="_XAxEUM2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Comment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBnY4M2QEeSF96aioTD1kQ" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008" hint="4015">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBnY4M2QEeSF96aioTD1kQ"

+      name="Comment Annotated Element"

+      identifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008"

+      hint="4015">

     <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_qREM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070" hint="3070">

-    <iconEntry xmi:id="_W_q4IM2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_qREM2QEeSF96aioTD1kQ"

+      name="Component"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070"

+      hint="3070">

+    <iconEntry

+        xmi:id="_W_q4IM2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Component.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_t7cM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071" hint="3071">

-    <iconEntry xmi:id="_W_t7cc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_t7cM2QEeSF96aioTD1kQ"

+      name="Component"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071"

+      hint="3071">

+    <iconEntry

+        xmi:id="_W_t7cc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Component.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAafAM2QEeSF96aioTD1kQ" name="Component" identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002" hint="2002">

-    <iconEntry xmi:id="_XAafAc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAafAM2QEeSF96aioTD1kQ"

+      name="Component"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002"

+      hint="2002">

+    <iconEntry

+        xmi:id="_XAafAc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Component.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBhSQM2QEeSF96aioTD1kQ" name="Component Realization" identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007" hint="4007">

-    <iconEntry xmi:id="_XBhSQc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBhSQM2QEeSF96aioTD1kQ"

+      name="Component Realization"

+      identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007"

+      hint="4007">

+    <iconEntry

+        xmi:id="_XBhSQc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/ComponentRealization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XB2pcM2QEeSF96aioTD1kQ" name="Connector" identifier="org.eclipse.papyrus.uml.diagram.component.Connector_4019" hint="4019">

-    <iconEntry xmi:id="_XB2pcc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XB2pcM2QEeSF96aioTD1kQ"

+      name="Connector"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Connector_4019"

+      hint="4019">

+    <iconEntry

+        xmi:id="_XB2pcc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Connector.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_0CEM2QEeSF96aioTD1kQ" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075" hint="3075">

-    <iconEntry xmi:id="_W_0CEc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_0CEM2QEeSF96aioTD1kQ"

+      name="Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075"

+      hint="3075">

+    <iconEntry

+        xmi:id="_W_0CEc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XA180M2QEeSF96aioTD1kQ" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199" hint="3199">

-    <iconEntry xmi:id="_XA180c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XA180M2QEeSF96aioTD1kQ"

+      name="Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199"

+      hint="3199">

+    <iconEntry

+        xmi:id="_XA180c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBnY4c2QEeSF96aioTD1kQ" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009" hint="4009">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBnY4c2QEeSF96aioTD1kQ"

+      name="Constraint Constrained Element"

+      identifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009"

+      hint="4009">

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XA61UM2QEeSF96aioTD1kQ" name="Default Named Element" identifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204" hint="3204">

-    <iconEntry xmi:id="_XA61Uc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XA61UM2QEeSF96aioTD1kQ"

+      name="Default Named Element"

+      identifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204"

+      hint="3204">

+    <iconEntry

+        xmi:id="_XA61Uc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/NamedElement.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBxw8M2QEeSF96aioTD1kQ" name="Dependency" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017" hint="4017">

-    <iconEntry xmi:id="_XBxw8c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBxw8M2QEeSF96aioTD1kQ"

+      name="Dependency"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"

+      hint="4017">

+    <iconEntry

+        xmi:id="_XBxw8c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Dependency.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBsRYM2QEeSF96aioTD1kQ" name="Dependency Link" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4010" hint="4010">

-    <iconEntry xmi:id="_XBsRYc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBsRYM2QEeSF96aioTD1kQ"

+      name="Dependency Link"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"

+      hint="4010">

+    <iconEntry

+        xmi:id="_XBsRYc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Dependency.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XATxUM2QEeSF96aioTD1kQ" name="Dependency Node" identifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203" hint="3203">

-    <iconEntry xmi:id="_XATxUc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XATxUM2QEeSF96aioTD1kQ"

+      name="Dependency Node"

+      identifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203"

+      hint="3203">

+    <iconEntry

+        xmi:id="_XATxUc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Dependency.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBQzkM2QEeSF96aioTD1kQ" name="Generalization" identifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003" hint="4003">

-    <iconEntry xmi:id="_XBQzkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBQzkM2QEeSF96aioTD1kQ"

+      name="Generalization"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"

+      hint="4003">

+    <iconEntry

+        xmi:id="_XBQzkc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Generalization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_i8UM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3078" hint="3078">

-    <iconEntry xmi:id="_W_i8Uc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_i8UM2QEeSF96aioTD1kQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3078"

+      hint="3078">

+    <iconEntry

+        xmi:id="_W_i8Uc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAHkEM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072" hint="3072">

-    <iconEntry xmi:id="_XAHkEc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAHkEM2QEeSF96aioTD1kQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072"

+      hint="3072">

+    <iconEntry

+        xmi:id="_XAHkEc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAq9sM2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3205" hint="3205">

-    <iconEntry xmi:id="_XAq9sc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAq9sM2QEeSF96aioTD1kQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3205"

+      hint="3205">

+    <iconEntry

+        xmi:id="_XAq9sc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBAU4M2QEeSF96aioTD1kQ" name="Interface" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003" hint="2003">

-    <iconEntry xmi:id="_XBAU4c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBAU4M2QEeSF96aioTD1kQ"

+      name="Interface"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003"

+      hint="2003">

+    <iconEntry

+        xmi:id="_XBAU4c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Interface.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBLUAM2QEeSF96aioTD1kQ" name="Interface Realization" identifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006" hint="4006">

-    <iconEntry xmi:id="_XBLUAc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBLUAM2QEeSF96aioTD1kQ"

+      name="Interface Realization"

+      identifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"

+      hint="4006">

+    <iconEntry

+        xmi:id="_XBLUAc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/InterfaceRealization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBbysM2QEeSF96aioTD1kQ" name="Manifestation" identifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014" hint="4014">

-    <iconEntry xmi:id="_XBbysc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBbysM2QEeSF96aioTD1kQ"

+      name="Manifestation"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014"

+      hint="4014">

+    <iconEntry

+        xmi:id="_XBbysc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Manifestation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_bnkM2QEeSF96aioTD1kQ" name="Model" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3077" hint="3077">

-    <iconEntry xmi:id="_W_bnkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_bnkM2QEeSF96aioTD1kQ"

+      name="Model"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Model_3077"

+      hint="3077">

+    <iconEntry

+        xmi:id="_W_bnkc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Model.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAfXgM2QEeSF96aioTD1kQ" name="Model" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3202" hint="3202">

-    <iconEntry xmi:id="_XAfXgc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAfXgM2QEeSF96aioTD1kQ"

+      name="Model"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Model_3202"

+      hint="3202">

+    <iconEntry

+        xmi:id="_XAfXgc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Model.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_8k8M2QEeSF96aioTD1kQ" name="Operation" identifier="org.eclipse.papyrus.uml.diagram.component.Operation_5" hint="5">

-    <iconEntry xmi:id="_W_8k8c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_8k8M2QEeSF96aioTD1kQ"

+      name="Operation"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Operation_5"

+      hint="5">

+    <iconEntry

+        xmi:id="_W_8k8c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Operation.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W-nvQM2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Model_1000" hint="PapyrusUMLComponentDiagram">

-    <iconEntry xmi:id="_W-nvQc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W-nvQM2QEeSF96aioTD1kQ"

+      name="Package"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Model_1000"

+      hint="PapyrusUMLComponentDiagram">

+    <iconEntry

+        xmi:id="_W-nvQc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_eq4M2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3076" hint="3076">

-    <iconEntry xmi:id="_W_eq4c2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_eq4M2QEeSF96aioTD1kQ"

+      name="Package"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Package_3076"

+      hint="3076">

+    <iconEntry

+        xmi:id="_W_eq4c2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAmFMM2QEeSF96aioTD1kQ" name="Package" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3200" hint="3200">

-    <iconEntry xmi:id="_XAmFMc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAmFMM2QEeSF96aioTD1kQ"

+      name="Package"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Package_3200"

+      hint="3200">

+    <iconEntry

+        xmi:id="_XAmFMc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_X9MM2QEeSF96aioTD1kQ" name="Port" identifier="org.eclipse.papyrus.uml.diagram.component.Port_3069" hint="3069">

-    <iconEntry xmi:id="_W_X9Mc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_X9MM2QEeSF96aioTD1kQ"

+      name="Port"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Port_3069"

+      hint="3069">

+    <iconEntry

+        xmi:id="_W_X9Mc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Port.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_W_3FYM2QEeSF96aioTD1kQ" name="Property" identifier="org.eclipse.papyrus.uml.diagram.component.Property_1" hint="1">

-    <iconEntry xmi:id="_W_3FYc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_W_3FYM2QEeSF96aioTD1kQ"

+      name="Property"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Property_1"

+      hint="1">

+    <iconEntry

+        xmi:id="_W_3FYc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XAORwM2QEeSF96aioTD1kQ" name="Property" identifier="org.eclipse.papyrus.uml.diagram.component.Property_3079" hint="3079">

-    <iconEntry xmi:id="_XAORwc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XAORwM2QEeSF96aioTD1kQ"

+      name="Property"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Property_3079"

+      hint="3079">

+    <iconEntry

+        xmi:id="_XAORwc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Property.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XACrkM2QEeSF96aioTD1kQ" name="Reception" identifier="org.eclipse.papyrus.uml.diagram.component.Reception_6" hint="6">

-    <iconEntry xmi:id="_XACrkc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XACrkM2QEeSF96aioTD1kQ"

+      name="Reception"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Reception_6"

+      hint="6">

+    <iconEntry

+        xmi:id="_XACrkc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Reception.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBWTIM2QEeSF96aioTD1kQ" name="Substitution" identifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012" hint="4012">

-    <iconEntry xmi:id="_XBWTIc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBWTIM2QEeSF96aioTD1kQ"

+      name="Substitution"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012"

+      hint="4012">

+    <iconEntry

+        xmi:id="_XBWTIc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Substitution.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_XBF0cM2QEeSF96aioTD1kQ" name="Usage" identifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001" hint="4001">

-    <iconEntry xmi:id="_XBF0cc2QEeSF96aioTD1kQ" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_XBF0cM2QEeSF96aioTD1kQ"

+      name="Usage"

+      identifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001"

+      hint="4001">

+    <iconEntry

+        xmi:id="_XBF0cc2QEeSF96aioTD1kQ"

+        iconPath="/icons/full/obj16/Usage.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

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 1fc8e2e9e49..595c46e3611 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
@@ -1015,10 +1015,17 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.component.elementTypeSet"
+   		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/ComponentDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
+<extension
+      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+   <elementTypeSet
+   		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+         path="model/ComponentDiagram-notation.elementtypesconfigurations">
+   </elementTypeSet>
+</extension>
 
    <extension
       point="org.eclipse.papyrus.infra.gmfdiag.common.diagramReconciler">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/helper/advice/CollaborationHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/helper/advice/CollaborationHelperAdvice.java
index c4c36289b30..809eaceb00b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/helper/advice/CollaborationHelperAdvice.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/helper/advice/CollaborationHelperAdvice.java
@@ -40,11 +40,6 @@ import org.eclipse.uml2.uml.UMLPackage;
  */

 public class CollaborationHelperAdvice extends AbstractEditHelperAdvice {

 

-	/** The hint of Collaboration role (not always possible to distinguish role and property with the model information). */

-	final String COLLABORATION_ROLE_HINT = ((IHintedType) UMLElementTypes.ConnectableElement_3115).getSemanticHint();

-

-	/** The hint of Collaboration role (not always possible to distinguish role and property with the model information). */

-	final String ROLE_BINDING_HINT = ((IHintedType) UMLElementTypes.Dependency_4017).getSemanticHint();

 

 	@Override

 	protected ICommand getBeforeDestroyReferenceCommand(DestroyReferenceRequest request) {

@@ -137,7 +132,7 @@ public class CollaborationHelperAdvice extends AbstractEditHelperAdvice {
 				if (currentChildObject instanceof View) {

 					View currentChildView = (View) currentChildObject;

 

-					if ((COLLABORATION_ROLE_HINT.equals(currentChildView.getType())) && (currentChildView.getElement() == role)) {

+					if ((((IHintedType) UMLElementTypes.ConnectableElement_3115).getSemanticHint().equals(currentChildView.getType())) && (currentChildView.getElement() == role)) {

 						viewsToDelete.add(currentChildView);

 					}

 				}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
index 0e567bd53b8..ce998e7a9e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
@@ -1,12 +1,38 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_tT4HoLazEeSbnofizoRSMQ" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT4HobazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3121" hint="3121" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_tT4HoLazEeSbnofizoRSMQ"

+    name="elementTypeSetNotation"

+    identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSetNotation"

+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT4HobazEeSbnofizoRSMQ"

+      name="Undefined"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3121"

+      hint="3121"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT5VwLazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4022" hint="4022" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT5VwLazEeSbnofizoRSMQ"

+      name="Undefined"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4022"

+      hint="4022"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tT5VwbazEeSbnofizoRSMQ" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4001" hint="4001" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_tT5VwbazEeSbnofizoRSMQ"

+      name="Undefined"

+      identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4001"

+      hint="4001"

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

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
index c906ff16b01..ff02da198d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
@@ -6,6 +6,7 @@
     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

     xmi:id="_tL86sLazEeSbnofizoRSMQ"

     name="CompositeStructure"

+    identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet"

     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

   <elementTypeConfigurations

       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

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 82a6f9519aa..3753fec6493 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
@@ -939,14 +939,14 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet"
+   		clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/compositediagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.composite.elementTypeSetNotation"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/compositediagram-notation.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
index d24aef12af7..f8b988db06f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_rcmpgv_cEeS2GcUTq58BKg" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_rcnQkP_cEeS2GcUTq58BKg" name="Undefined" identifier="org.eclipse.papyrus.uml.diagram.deployment.Link_4005" hint="4005" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmi:id="_rcmpgv_cEeS2GcUTq58BKg"
+    name="elementTypeSetNotation"
+    identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSetNotation"
+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_rcnQkP_cEeS2GcUTq58BKg"
+      name="Undefined"
+      identifier="org.eclipse.papyrus.uml.diagram.deployment.Link_4005"
+      hint="4005"
+      kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
index 0dee258c1d5..5218e951699 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
@@ -6,6 +6,7 @@
     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
     xmi:id="_gvIwYP8PEeS2nvlxgM4H8g"
     name="PapyrusUMLDeploymentDiagram"
+    identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSet"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
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 1a17c561c1a..9525a8b604f 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
@@ -749,10 +749,17 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSet"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/DeploymentDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
+<extension
+      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+   <elementTypeSet
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
+         path="model/DeploymentDiagram-notation.elementtypesconfigurations">
+   </elementTypeSet>
+</extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
       <?gmfgen generated="true"?>
       <visualTypeProvider
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
index a41329caa37..44d9e46abc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
@@ -1,13 +1,45 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" hint="5000">

-    <iconEntry xmi:id="_x8G0ymaNEeSyJIsxLao1Pw" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_x8G0YGaNEeSyJIsxLao1Pw"

+    name="elementTypeSet"

+    identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_x8G0yWaNEeSyJIsxLao1Pw"

+      name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000"

+      identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000"

+      hint="5000">

+    <iconEntry

+        xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"

+        iconPath="/icons/full/obj16/CallBehaviorAction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_FYd2YGpzEeSbA6Db03aufw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_FYd2YGpzEeSbA6Db03aufw"

+        identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice"

+        editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_QywZsOm6EeSdwvyVD4uXcQ" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" hint="5005">

-    <iconEntry xmi:id="_sFytEOm6EeSdwvyVD4uXcQ" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_QywZsOm6EeSdwvyVD4uXcQ"

+      name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005"

+      identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005"

+      hint="5005">

+    <iconEntry

+        xmi:id="_sFytEOm6EeSdwvyVD4uXcQ"

+        iconPath="/icons/full/obj16/CallBehaviorAction.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>

   </elementTypeConfigurations>

-  <adviceBindingsConfigurations xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" name="" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" target="_QywZsOm6EeSdwvyVD4uXcQ"/>

+  <adviceBindingsConfigurations

+      xmi:id="_zAcw0GaOEeSyJIsxLao1Pw"

+      name=""

+      identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice"

+      target="_QywZsOm6EeSdwvyVD4uXcQ"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index db2544fd3ef..a90f16750f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -723,7 +723,7 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/interactionOverviewDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram-notation.elementtypesconfigurations
deleted file mode 100644
index 85cd46313eb..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram-notation.elementtypesconfigurations
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_MSXTwORAEeSg9_CuHKArkw" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
index 98e87761408..c6ce43237a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
@@ -6,6 +6,7 @@
     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
     xmi:id="_MKAB8ORAEeSg9_CuHKArkw"
     name="PapyrusUMLProfileDiagram"
+    identifier="org.eclipse.papyrus.uml.diagram.profile.elementTypeSet"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
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 18fc33a3b22..09e3eee65d5 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
@@ -973,7 +973,7 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.profile.elementTypeSet"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/profilediagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram-notation.elementtypesconfigurations
deleted file mode 100644
index 3804e416f75..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram-notation.elementtypesconfigurations
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_whub8MeDEeSwP_9Vn5UnWg" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
index 09133d46bc8..5383ebc70a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
@@ -1,114 +1,349 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_wYwtMMeDEeSwP_9Vn5UnWg" name="PapyrusUMLStateMachineDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whhAkMeDEeSwP_9Vn5UnWg" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment" hint="666">

-    <iconEntry xmi:id="_whhAkceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_wYwtMMeDEeSwP_9Vn5UnWg"

+    name="PapyrusUMLStateMachineDiagram"

+    identifier="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whhAkMeDEeSwP_9Vn5UnWg"

+      name="Comment"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment"

+      hint="666">

+    <iconEntry

+        xmi:id="_whhAkceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Comment.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whtN0MeDEeSwP_9Vn5UnWg" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667" hint="667">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whtN0MeDEeSwP_9Vn5UnWg"

+      name="Comment Annotated Element"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667"

+      hint="667">

     <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whfycMeDEeSwP_9Vn5UnWg" name="Connection Point Reference" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000" hint="18000">

-    <iconEntry xmi:id="_whfycceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whfycMeDEeSwP_9Vn5UnWg"

+      name="Connection Point Reference"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000"

+      hint="18000">

+    <iconEntry

+        xmi:id="_whfycceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/ConnectionPointReference.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.ConnectionPointReference</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whi1wMeDEeSwP_9Vn5UnWg" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668" hint="668">

-    <iconEntry xmi:id="_whi1wceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whi1wMeDEeSwP_9Vn5UnWg"

+      name="Constraint"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668"

+      hint="668">

+    <iconEntry

+        xmi:id="_whi1wceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Constraint.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_wht04MeDEeSwP_9Vn5UnWg" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670" hint="670">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_wht04MeDEeSwP_9Vn5UnWg"

+      name="Constraint Constrained Element"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670"

+      hint="670">

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_wht04ceDEeSwP_9Vn5UnWg" name="Constraint Context" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500" hint="8500">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_wht04ceDEeSwP_9Vn5UnWg"

+      name="Constraint Context"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500"

+      hint="8500">

     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whnuQMeDEeSwP_9Vn5UnWg" name="Do Activity State Behavior" identifier="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691" hint="691">

-    <iconEntry xmi:id="_whnuQceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whnuQMeDEeSwP_9Vn5UnWg"

+      name="Do Activity State Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691"

+      hint="691">

+    <iconEntry

+        xmi:id="_whnuQceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Behavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whmgIMeDEeSwP_9Vn5UnWg" name="Entry State Behavior" identifier="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690" hint="690">

-    <iconEntry xmi:id="_whmgIceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whmgIMeDEeSwP_9Vn5UnWg"

+      name="Entry State Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690"

+      hint="690">

+    <iconEntry

+        xmi:id="_whmgIceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Behavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::entry</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_who8YMeDEeSwP_9Vn5UnWg" name="Exit State Behavior" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692" hint="692">

-    <iconEntry xmi:id="_who8YceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_who8YMeDEeSwP_9Vn5UnWg"

+      name="Exit State Behavior"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692"

+      hint="692">

+    <iconEntry

+        xmi:id="_who8YceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Behavior.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::exit</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whMQcMeDEeSwP_9Vn5UnWg" name="Final State" identifier="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000" hint="5000">

-    <iconEntry xmi:id="_whMQcceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whMQcMeDEeSwP_9Vn5UnWg"

+      name="Final State"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000"

+      hint="5000">

+    <iconEntry

+        xmi:id="_whMQcceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/FinalState.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.FinalState</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whsmwMeDEeSwP_9Vn5UnWg" name="Generalization" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000" hint="19000">

-    <iconEntry xmi:id="_whsmwceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whsmwMeDEeSwP_9Vn5UnWg"

+      name="Generalization"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000"

+      hint="19000">

+    <iconEntry

+        xmi:id="_whsmwceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Generalization.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whkq8MeDEeSwP_9Vn5UnWg" name="Internal Transition" identifier="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680" hint="680">

-    <iconEntry xmi:id="_whkq8ceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whkq8MeDEeSwP_9Vn5UnWg"

+      name="Internal Transition"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680"

+      hint="680">

+    <iconEntry

+        xmi:id="_whkq8ceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Transition.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_wc3KEMeDEeSwP_9Vn5UnWg" name="Package" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000" hint="PapyrusUMLStateMachineDiagram">

-    <iconEntry xmi:id="_wc3KEceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_wc3KEMeDEeSwP_9Vn5UnWg"

+      name="Package"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000"

+      hint="PapyrusUMLStateMachineDiagram">

+    <iconEntry

+        xmi:id="_wc3KEceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Package.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whPTwMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000" hint="8000">

-    <iconEntry xmi:id="_whPTwceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whPTwMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000"

+      hint="8000">

+    <iconEntry

+        xmi:id="_whPTwceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whRI8MeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000" hint="9000">

-    <iconEntry xmi:id="_whRI8ceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whRI8MeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000"

+      hint="9000">

+    <iconEntry

+        xmi:id="_whRI8ceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whS-IMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000" hint="10000">

-    <iconEntry xmi:id="_whS-IceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whS-IMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000"

+      hint="10000">

+    <iconEntry

+        xmi:id="_whS-IceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whUMQMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000" hint="11000">

-    <iconEntry xmi:id="_whUMQceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whUMQMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000"

+      hint="11000">

+    <iconEntry

+        xmi:id="_whUMQceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whWBcMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000" hint="12000">

-    <iconEntry xmi:id="_whWBcceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whWBcMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000"

+      hint="12000">

+    <iconEntry

+        xmi:id="_whWBcceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whXPkMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000" hint="13000">

-    <iconEntry xmi:id="_whXPkceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whXPkMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000"

+      hint="13000">

+    <iconEntry

+        xmi:id="_whXPkceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whZEwMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000" hint="14000">

-    <iconEntry xmi:id="_whZEwceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whZEwMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000"

+      hint="14000">

+    <iconEntry

+        xmi:id="_whZEwceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_wha58MeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000" hint="15000">

-    <iconEntry xmi:id="_wha58ceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_wha58MeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000"

+      hint="15000">

+    <iconEntry

+        xmi:id="_wha58ceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whcvIMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000" hint="16000">

-    <iconEntry xmi:id="_whcvIceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whcvIMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000"

+      hint="16000">

+    <iconEntry

+        xmi:id="_whcvIceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whd9QMeDEeSwP_9Vn5UnWg" name="Pseudostate" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000" hint="17000">

-    <iconEntry xmi:id="_whd9QceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whd9QMeDEeSwP_9Vn5UnWg"

+      name="Pseudostate"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000"

+      hint="17000">

+    <iconEntry

+        xmi:id="_whd9QceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Pseudostate.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whH_AMeDEeSwP_9Vn5UnWg" name="Region" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000" hint="3000">

-    <iconEntry xmi:id="_whH_AceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whH_AMeDEeSwP_9Vn5UnWg"

+      name="Region"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000"

+      hint="3000">

+    <iconEntry

+        xmi:id="_whH_AceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Region.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Region</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whOFoMeDEeSwP_9Vn5UnWg" name="State" identifier="org.eclipse.papyrus.uml.diagram.statemachine.State_6000" hint="6000">

-    <iconEntry xmi:id="_whOFoceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whOFoMeDEeSwP_9Vn5UnWg"

+      name="State"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.State_6000"

+      hint="6000">

+    <iconEntry

+        xmi:id="_whOFoceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/State.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whqKgMeDEeSwP_9Vn5UnWg" name="State Machine" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000" hint="2000">

-    <iconEntry xmi:id="_whqKgceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whqKgMeDEeSwP_9Vn5UnWg"

+      name="State Machine"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000"

+      hint="2000">

+    <iconEntry

+        xmi:id="_whqKgceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/StateMachine.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_whrYoMeDEeSwP_9Vn5UnWg" name="Transition" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000" hint="7000">

-    <iconEntry xmi:id="_whrYoceDEeSwP_9Vn5UnWg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_whrYoMeDEeSwP_9Vn5UnWg"

+      name="Transition"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000"

+      hint="7000">

+    <iconEntry

+        xmi:id="_whrYoceDEeSwP_9Vn5UnWg"

+        iconPath="/icons/full/obj16/Transition.gif"

+        bundleId="org.eclipse.uml2.uml.edit"/>

     <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_QoNH8NI_EeSQKMzCpfBfWg" name="org.eclipse.papyrus.uml.BasePseudostateType" identifier="org.eclipse.papyrus.uml.BasePseudostateType" hint="org.eclipse.papyrus.uml.BasePseudostateType">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_QoNH8NI_EeSQKMzCpfBfWg"

+      name="org.eclipse.papyrus.uml.BasePseudostateType"

+      identifier="org.eclipse.papyrus.uml.BasePseudostateType"

+      hint="org.eclipse.papyrus.uml.BasePseudostateType">

     <specializedTypesID>org.eclipse.papyrus.uml.Pseudostate</specializedTypesID>

-    <editHelperAdviceConfiguration xmi:id="_EIBgsNJGEeSGnIOah6qfxQ" name="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice" inheritance="all"/>

+    <editHelperAdviceConfiguration

+        xmi:id="_EIBgsNJGEeSGnIOah6qfxQ"

+        name="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice"

+        identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice"

+        editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice"

+        inheritance="all"/>

   </elementTypeConfigurations>

-  <adviceBindingsConfigurations xmi:id="_Gdt5EMf7EeSG9OkAifWKOg" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" inheritance="all" target="_whqKgMeDEeSwP_9Vn5UnWg"/>

-  <adviceBindingsConfigurations xmi:id="_3RjqQMwTEeSyj5ums1L-vQ" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" inheritance="all" target="_whOFoMeDEeSwP_9Vn5UnWg"/>

+  <adviceBindingsConfigurations

+      xmi:id="_Gdt5EMf7EeSG9OkAifWKOg"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice"

+      inheritance="all"

+      target="_whqKgMeDEeSwP_9Vn5UnWg"/>

+  <adviceBindingsConfigurations

+      xmi:id="_3RjqQMwTEeSyj5ums1L-vQ"

+      identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice"

+      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice"

+      inheritance="all"

+      target="_whOFoMeDEeSwP_9Vn5UnWg"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

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 4e3497448c6..7ec75f752f1 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
@@ -214,11 +214,28 @@
       <binding context="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
       </binding>
+      
+      
    </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">
+			 <adviceBinding
+			   class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.NamespaceHelperAdvice"
+			   id="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice"
+			   inheritance="all"
+			   typeId="org.eclipse.papyrus.uml.Namespace">
+			 </adviceBinding>
+			 <adviceBinding
+			   class="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConstraintHelperAdvice"
+			   id="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice"
+			   inheritance="none"
+			   typeId="org.eclipse.papyrus.uml.Constraint">
+			 </adviceBinding>
+		</metamodel>
+	</extension>
 
    <extension point="org.eclipse.ui.menus" id="context-menus">
       <?gmfgen generated="true"?>
@@ -840,7 +857,7 @@
     <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/stateMachineDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
index 2cd07f46e0b..cc78197b6c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" name="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" hint="2019">

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_qxKXgFkiEeSozs_wDdvj0g"

+    name="elementTypeSetNotation"

+    identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSetNotation"

+    metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

+      xmi:id="_qxK-pFkiEeSozs_wDdvj0g"

+      name="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"

+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"

+      hint="2019">

     <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
index 536d388a805..25b10a7f791 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
@@ -1,140 +1,419 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" name="UseCase" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXgVkiEeSozs_wDdvj0g" name="Extension Point" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007" hint="3007">
-    <iconEntry xmi:id="_qxKXglkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmi:id="_qxKXgFkiEeSozs_wDdvj0g"
+    name="UseCase"
+    identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXgVkiEeSozs_wDdvj0g"
+      name="Extension Point"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"
+      hint="3007">
+    <iconEntry
+        xmi:id="_qxKXglkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/ExtensionPoint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXg1kiEeSozs_wDdvj0g" name="Extension Point" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008" hint="3008">
-    <iconEntry xmi:id="_qxKXhFkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXg1kiEeSozs_wDdvj0g"
+      name="Extension Point"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"
+      hint="3008">
+    <iconEntry
+        xmi:id="_qxKXhFkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/ExtensionPoint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXhVkiEeSozs_wDdvj0g" name="Use Case" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009" hint="3009">
-    <iconEntry xmi:id="_qxKXhlkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXhVkiEeSozs_wDdvj0g"
+      name="Use Case"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"
+      hint="3009">
+    <iconEntry
+        xmi:id="_qxKXhlkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/UseCase.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXh1kiEeSozs_wDdvj0g" name="Component" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3016" hint="3016">
-    <iconEntry xmi:id="_qxKXiFkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXh1kiEeSozs_wDdvj0g"
+      name="Component"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"
+      hint="3016">
+    <iconEntry
+        xmi:id="_qxKXiFkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Component.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXiVkiEeSozs_wDdvj0g" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015" hint="3015">
-    <iconEntry xmi:id="_qxKXilkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXiVkiEeSozs_wDdvj0g"
+      name="Comment"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015"
+      hint="3015">
+    <iconEntry
+        xmi:id="_qxKXilkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXi1kiEeSozs_wDdvj0g" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017" hint="3017">
-    <iconEntry xmi:id="_qxKXjFkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXi1kiEeSozs_wDdvj0g"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"
+      hint="3017">
+    <iconEntry
+        xmi:id="_qxKXjFkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXjVkiEeSozs_wDdvj0g" name="Actor" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018" hint="3018">
-    <iconEntry xmi:id="_qxKXjlkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXjVkiEeSozs_wDdvj0g"
+      name="Actor"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"
+      hint="3018">
+    <iconEntry
+        xmi:id="_qxKXjlkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Actor.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXj1kiEeSozs_wDdvj0g" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010" hint="3010">
-    <iconEntry xmi:id="_qxKXkFkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXj1kiEeSozs_wDdvj0g"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"
+      hint="3010">
+    <iconEntry
+        xmi:id="_qxKXkFkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXkVkiEeSozs_wDdvj0g" name="Actor" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011" hint="3011">
-    <iconEntry xmi:id="_qxKXklkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXkVkiEeSozs_wDdvj0g"
+      name="Actor"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"
+      hint="3011">
+    <iconEntry
+        xmi:id="_qxKXklkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Actor.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXk1kiEeSozs_wDdvj0g" name="Use Case" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012" hint="3012">
-    <iconEntry xmi:id="_qxKXlFkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXk1kiEeSozs_wDdvj0g"
+      name="Use Case"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"
+      hint="3012">
+    <iconEntry
+        xmi:id="_qxKXlFkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/UseCase.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxKXlVkiEeSozs_wDdvj0g" name="Component" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3013" hint="3013">
-    <iconEntry xmi:id="_qxKXllkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxKXlVkiEeSozs_wDdvj0g"
+      name="Component"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"
+      hint="3013">
+    <iconEntry
+        xmi:id="_qxKXllkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Component.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-kFkiEeSozs_wDdvj0g" name="Package" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_3014" hint="3014">
-    <iconEntry xmi:id="_qxK-kVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-kFkiEeSozs_wDdvj0g"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"
+      hint="3014">
+    <iconEntry
+        xmi:id="_qxK-kVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-klkiEeSozs_wDdvj0g" name="Actor" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011" hint="2011">
-    <iconEntry xmi:id="_qxK-k1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-klkiEeSozs_wDdvj0g"
+      name="Actor"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"
+      hint="2011">
+    <iconEntry
+        xmi:id="_qxK-k1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Actor.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-lFkiEeSozs_wDdvj0g" name="Actor as Classifier" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012" hint="2012">
-    <iconEntry xmi:id="_qxK-lVkiEeSozs_wDdvj0g" iconPath="/icons/obj16/Actor_as_Classifier.gif" bundleId="org.eclipse.papyrus.uml.diagram.usecase"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-lFkiEeSozs_wDdvj0g"
+      name="Actor as Classifier"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"
+      hint="2012">
+    <iconEntry
+        xmi:id="_qxK-lVkiEeSozs_wDdvj0g"
+        iconPath="/icons/obj16/Actor_as_Classifier.gif"
+        bundleId="org.eclipse.papyrus.uml.diagram.usecase"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-llkiEeSozs_wDdvj0g" name="Use Case" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013" hint="2013">
-    <iconEntry xmi:id="_qxK-l1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-llkiEeSozs_wDdvj0g"
+      name="Use Case"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"
+      hint="2013">
+    <iconEntry
+        xmi:id="_qxK-l1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/UseCase.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-mFkiEeSozs_wDdvj0g" name="Use Case as Classifier" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014" hint="2014">
-    <iconEntry xmi:id="_qxK-mVkiEeSozs_wDdvj0g" iconPath="/icons/obj16/UseCase_as_Classifier.gif" bundleId="org.eclipse.papyrus.uml.diagram.usecase"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-mFkiEeSozs_wDdvj0g"
+      name="Use Case as Classifier"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"
+      hint="2014">
+    <iconEntry
+        xmi:id="_qxK-mVkiEeSozs_wDdvj0g"
+        iconPath="/icons/obj16/UseCase_as_Classifier.gif"
+        bundleId="org.eclipse.papyrus.uml.diagram.usecase"/>
     <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-mlkiEeSozs_wDdvj0g" name="Classifier" identifier="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015" hint="2015">
-    <iconEntry xmi:id="_qxK-m1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Classifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-mlkiEeSozs_wDdvj0g"
+      name="Classifier"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"
+      hint="2015">
+    <iconEntry
+        xmi:id="_qxK-m1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Classifier.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Classifier</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-nFkiEeSozs_wDdvj0g" name="Package" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_2016" hint="2016">
-    <iconEntry xmi:id="_qxK-nVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-nFkiEeSozs_wDdvj0g"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"
+      hint="2016">
+    <iconEntry
+        xmi:id="_qxK-nVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-nlkiEeSozs_wDdvj0g" name="Constraint" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017" hint="2017">
-    <iconEntry xmi:id="_qxK-n1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-nlkiEeSozs_wDdvj0g"
+      name="Constraint"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"
+      hint="2017">
+    <iconEntry
+        xmi:id="_qxK-n1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Constraint.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-oFkiEeSozs_wDdvj0g" name="Comment" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018" hint="2018">
-    <iconEntry xmi:id="_qxK-oVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-oFkiEeSozs_wDdvj0g"
+      name="Comment"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018"
+      hint="2018">
+    <iconEntry
+        xmi:id="_qxK-oVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-olkiEeSozs_wDdvj0g" name="Default Named Element" identifier="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022" hint="2022">
-    <iconEntry xmi:id="_qxK-o1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-olkiEeSozs_wDdvj0g"
+      name="Default Named Element"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"
+      hint="2022">
+    <iconEntry
+        xmi:id="_qxK-o1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/NamedElement.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" name="Short Cut Diagram" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" hint="2019">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-pFkiEeSozs_wDdvj0g"
+      name="Short Cut Diagram"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019"
+      hint="2019">
     <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-plkiEeSozs_wDdvj0g" name="Include" identifier="org.eclipse.papyrus.uml.diagram.usecase.Include_4008" hint="4008">
-    <iconEntry xmi:id="_qxK-p1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-plkiEeSozs_wDdvj0g"
+      name="Include"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Include_4008"
+      hint="4008">
+    <iconEntry
+        xmi:id="_qxK-p1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Include.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Include</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-qFkiEeSozs_wDdvj0g" name="Extend" identifier="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009" hint="4009">
-    <iconEntry xmi:id="_qxK-qVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-qFkiEeSozs_wDdvj0g"
+      name="Extend"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009"
+      hint="4009">
+    <iconEntry
+        xmi:id="_qxK-qVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Extend.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Extend</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-qlkiEeSozs_wDdvj0g" name="Generalization" identifier="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010" hint="4010">
-    <iconEntry xmi:id="_qxK-q1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-qlkiEeSozs_wDdvj0g"
+      name="Generalization"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010"
+      hint="4010">
+    <iconEntry
+        xmi:id="_qxK-q1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Generalization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-rFkiEeSozs_wDdvj0g" name="Association" identifier="org.eclipse.papyrus.uml.diagram.usecase.Association_4011" hint="4011">
-    <iconEntry xmi:id="_qxK-rVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-rFkiEeSozs_wDdvj0g"
+      name="Association"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"
+      hint="4011">
+    <iconEntry
+        xmi:id="_qxK-rVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Association.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-rlkiEeSozs_wDdvj0g" name="Dependency" identifier="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013" hint="4013">
-    <iconEntry xmi:id="_qxK-r1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-rlkiEeSozs_wDdvj0g"
+      name="Dependency"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"
+      hint="4013">
+    <iconEntry
+        xmi:id="_qxK-r1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-sFkiEeSozs_wDdvj0g" name="Abstraction" identifier="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015" hint="4015">
-    <iconEntry xmi:id="_qxK-sVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-sFkiEeSozs_wDdvj0g"
+      name="Abstraction"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015"
+      hint="4015">
+    <iconEntry
+        xmi:id="_qxK-sVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-slkiEeSozs_wDdvj0g" name="Usage" identifier="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016" hint="4016">
-    <iconEntry xmi:id="_qxK-s1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-slkiEeSozs_wDdvj0g"
+      name="Usage"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016"
+      hint="4016">
+    <iconEntry
+        xmi:id="_qxK-s1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Usage.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-tFkiEeSozs_wDdvj0g" name="Realization" identifier="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017" hint="4017">
-    <iconEntry xmi:id="_qxK-tVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-tFkiEeSozs_wDdvj0g"
+      name="Realization"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017"
+      hint="4017">
+    <iconEntry
+        xmi:id="_qxK-tVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/Realization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-tlkiEeSozs_wDdvj0g" name="Package Merge" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018" hint="4018">
-    <iconEntry xmi:id="_qxK-t1kiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-tlkiEeSozs_wDdvj0g"
+      name="Package Merge"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018"
+      hint="4018">
+    <iconEntry
+        xmi:id="_qxK-t1kiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/PackageMerge.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_qxK-uFkiEeSozs_wDdvj0g" name="Package Import" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019" hint="4019">
-    <iconEntry xmi:id="_qxK-uVkiEeSozs_wDdvj0g" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_qxK-uFkiEeSozs_wDdvj0g"
+      name="Package Import"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019"
+      hint="4019">
+    <iconEntry
+        xmi:id="_qxK-uVkiEeSozs_wDdvj0g"
+        iconPath="/icons/full/obj16/PackageImport.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_HAqeSGqFEeS1S7nMA1LVzg" name="Comment Annotated Element" identifier="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014" hint="4014">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_HAqeSGqFEeS1S7nMA1LVzg"
+      name="Comment Annotated Element"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014"
+      hint="4014">
     <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_HAqeRWqFEeS1S7nMA1LVzg" name="Constraint Constrained Element" identifier="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012" hint="4012">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_HAqeRWqFEeS1S7nMA1LVzg"
+      name="Constraint Constrained Element"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"
+      hint="4012">
     <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ewRrIK_rEeSWIf43-VACFg" name="Package" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_1000" hint="UseCase">
-    <iconEntry xmi:id="_ewRrIa_rEeSWIf43-VACFg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_ewRrIK_rEeSWIf43-VACFg"
+      name="Package"
+      identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"
+      hint="UseCase">
+    <iconEntry
+        xmi:id="_ewRrIa_rEeSWIf43-VACFg"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
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 446e69b2b98..cf887fb91c7 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
@@ -976,14 +976,14 @@
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="models/usecaseDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
    <elementTypeSet
-         id="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSetNotation"
+   clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="models/usecaseDiagram-notation.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
index e67af61a759..882bd902578 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmi:id="_jfoLkGT_EeSEqNuV3JpFCA" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard">

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Wv4tEGUAEeSEqNuV3JpFCA" name="UML::Stereotype::Trace" identifier="org.eclipse.papyrus.uml.stereotype.Trace" hint="UML::Stereotype::Trace" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_jfoLkGT_EeSEqNuV3JpFCA"

+    identifier="org.eclipse.papyrus.uml.service.types.StandardProfile"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard">

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_Wv4tEGUAEeSEqNuV3JpFCA"

+      name="UML::Stereotype::Trace"

+      identifier="org.eclipse.papyrus.uml.stereotype.Trace"

+      hint="UML::Stereotype::Trace"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_Wv4tEWUAEeSEqNuV3JpFCA" name="UML::Stereotype::Refine" identifier="org.eclipse.papyrus.uml.stereotype.Refine" hint="UML::Stereotype::Refine" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

-    <eClass href="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>

+  <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_Wv4tEWUAEeSEqNuV3JpFCA"

+      name="UML::Stereotype::Refine"

+      identifier="org.eclipse.papyrus.uml.stereotype.Refine"

+      hint="UML::Stereotype::Refine"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index a693005f606..2df67356e20 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -5,6 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

     xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    identifier="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet"

     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

   <elementTypeConfigurations

       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
index 81925cf2c02..96f19e86443 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
@@ -5,6 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
     xmi:id="_ScP1oFYCEeS0WsAAtVmToA"
+    name="UMLElementTypeSet"
+    identifier="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
@@ -3732,12 +3734,13 @@
       inheritance="all"
       target="_SccC-1YCEeS0WsAAtVmToA"/>
   <adviceBindingsConfigurations
-  	  xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" 
-  	  name="" description="" 
-  	  identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" 
-  	  editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice" 
-  	  inheritance="all" 
-  	  target="_SccC-1YCEeS0WsAAtVmToA"/>
+      xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ"
+      name=""
+      description=""
+      identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice"
+      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice"
+      inheritance="all"
+      target="_SccC-1YCEeS0WsAAtVmToA"/>
   <adviceBindingsConfigurations
       xmi:id="_R_pDcWT7EeSzFvTXGJPhUg"
       name="org.eclipse.papyrus.uml.advice.Classifier"
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
index 50035a3a30b..a0c5156019c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
@@ -1879,21 +1879,21 @@
  <extension
        point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
     <elementTypeSet
-          id="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"
+    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml.elementtypesconfigurations">
     </elementTypeSet>
  </extension>
   <extension
        point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
     <elementTypeSet
-          id="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet"
+    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml-containments.elementtypesconfigurations">
     </elementTypeSet>
  </extension>
  <extension
        point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
     <elementTypeSet
-          id="org.eclipse.papyrus.uml.service.types.StandardProfileElementTypeSet"
+    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/StandardProfile.elementtypesconfigurations">
     </elementTypeSet>
  </extension>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
index 214ec80e403..31d8d0b33de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
@@ -5,13 +5,16 @@ import java.util.List;
 

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

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

 import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeRegistryUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

 

 abstract public class AbstractFeatureRelationshipReorientEditHelperAdvice extends AbstractEditHelperAdvice {

 

@@ -22,14 +25,22 @@ abstract public class AbstractFeatureRelationshipReorientEditHelperAdvice extend
 		Object value = request.getParameters().get(DefaultSemanticEditPolicy.GRAPHICAL_RECONNECTED_EDGE);

 

 		if (value instanceof View) {

-			List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(((View) value).getType());

 

-			for (IElementType iElementType : elementTypes) {

-				List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(elementTypeIDToSpecialize()));

-				if (subs.contains(iElementType)) {

-					return getFeatureRelationshipReorientCommand(request);

+			try {

+				IClientContext context = TypeContext.getContext();

+				List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(((View) value).getType(), context.getId());

+

+				for (IElementType iElementType : elementTypes) {

+					List<ISpecializationType> subs = Arrays.asList(ElementTypeRegistry.getInstance().getSpecializationsOf(elementTypeIDToSpecialize()));

+					if (subs.contains(iElementType)) {

+						return getFeatureRelationshipReorientCommand(request);

+					}

 				}

+			} catch (ServiceException e) {

+				// TODO Auto-generated catch block

+				e.printStackTrace();

 			}

+

 		}

 

 		return null;

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations
new file mode 100644
index 00000000000..a4122a8b0c7
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="Test cyclic edvices dependencies"

+    identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <adviceBindingsConfigurations

+      xmi:id="_SGAo4LK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice1"

+      identifier="TestEditHelperAdvice1"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1">

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_nSyIoLK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice2"

+      identifier="TestEditHelperAdvice2"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2">

+    <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_ojuzILK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice3"

+      identifier="TestEditHelperAdvice3"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3">

+    <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>

+    <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
index 125a0ad1f99..53a85abfb53 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
@@ -13,6 +13,7 @@
     xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"

     xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

     name="Test element types"

+    identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"

     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

   <elementTypeConfigurations

       xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration"

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations
new file mode 100644
index 00000000000..c621816c8c3
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ASCII"?>

+<elementtypesconfigurations:ElementTypeSetConfiguration

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"

+    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"

+    name="Test cyclic edvices dependencies"

+    identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations"

+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <adviceBindingsConfigurations

+      xmi:id="_SGAo4LK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice1"

+      identifier="TestEditHelperAdvice1"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1">

+    <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_nSyIoLK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice2"

+      identifier="TestEditHelperAdvice2"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2">

+    <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</before>

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations

+      xmi:id="_ojuzILK-EeWUIbTgfwAP3g"

+      name="TestEditHelperAdvice3"

+      identifier="TestEditHelperAdvice3"

+      editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3">

+    <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>

+    <target

+        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
index 133a60204d3..604ae6cf4da 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"
+      	    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="model/elementtypetest.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
index cac6e74c8f2..17ec1f21322 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
@@ -1,239 +1,307 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Package;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Based upon ExtendedEditHelperAdviceTests
- * Test class for element type edit helper advice
- */
-public class ElementEditHelperAdviceTests extends AbstractElementTypeTests implements ITestConstants {
-
-	@Test
-	// transcoded from extended types framework
-	public void testPACKAGE_WITH_COMPONENTSType() {
-		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithComponents, papyrusContext));
-		Assert.assertNotNull("list should not be null", elementTypes);
-		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
-		System.out.println("elementTypes.size() " + elementTypes.size());
-		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
-	}
-
-	@Test
-	public void testPACKAGE_WITH_ALL_ELEMENTSType() {
-		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));
-		Assert.assertNotNull("list should not be null", elementTypes);
-		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
-		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
-	}
-
-	@Test
-	// transcoded from extended types framework
-	public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {
-		testCreateComponent(packageWithComponents, true);
-	}
-
-	@Test
-	// transcoded from extended types framework
-	public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {
-		testCreateComponent(packageWithAllElements, false);
-	}
-
-	protected void testCreateComponent(Package container, boolean canCreate) throws ExecutionException {
-		IProgressMonitor monitor = new NullProgressMonitor();
-		// should be possible
-		IElementType type = ElementTypeRegistry.getInstance().getType(SPECIFICCOMPONENT_TYPE_ID);
-		CreateElementRequest request = new CreateElementRequest(transactionalEditingDomain, container, type);
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(container);
-		ICommand command = service.getEditCommand(request);
-		// get children before modification
-		List<EObject> originalChildren = new ArrayList<EObject>(container.getPackagedElements());
-		if (canCreate) {
-			Assert.assertTrue("Command should be executable", command.canExecute());
-			IStatus status = command.execute(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			// get result
-			List<EObject> afterCreationChildren = new ArrayList<EObject>(container.getPackagedElements());
-			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have only one more element", 1, delta.size());
-			// check it does not impact undo
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterUndoChildren = new ArrayList<EObject>(container.getPackagedElements());
-			delta = new ArrayList<EObject>(afterUndoChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have no element", 0, delta.size());
-			// should be redoable
-			Assert.assertTrue("Command should be redoable", command.canRedo());
-			status = command.redo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterRedoChildren = new ArrayList<EObject>(container.getPackagedElements());
-			delta = new ArrayList<EObject>(afterRedoChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have one more element", 1, delta.size());
-			// undo to revert state
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-		} else {
-			Assert.assertTrue("Command should not be executable", command == null || !(command.canExecute()));
-		}
-	}
-
-	@Test
-	public void testSemanticMoveComponentFromGoodPackageToGoodPackage() throws ExecutionException {
-		// should be possible (target = good package)
-		testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);
-	}
-
-	@Test
-	// transcoded from extended types framework
-	public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {
-		// should be impossible (target = wrong package)
-		testMoveComponent(packageWithAllElements, component1_packageWithComponents, false);
-	}
-
-	@Test
-	public void testSemanticMoveComponentFromWrongPackageToGoodPackage() throws ExecutionException {
-		// should be possible (target = good package)
-		testMoveComponent(packageWithComponents, component1_packageWithAllElements, true);
-	}
-
-	@Test
-	public void testSemanticMoveComponentFromWrongPackageToWrongPackage() throws ExecutionException {
-		// should be impossible (target = wrong package)
-		testMoveComponent(packageWithAllElements, component1_packageWithAllElements, false);
-	}
-
-	protected void testMoveComponent(Package targetContainer, Component sourceComponent, boolean canMove) throws ExecutionException {
-		IProgressMonitor monitor = new NullProgressMonitor();
-		// should be possible
-		MoveRequest request = new MoveRequest(transactionalEditingDomain, targetContainer, sourceComponent);
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(targetContainer);
-		ICommand command = service.getEditCommand(request);
-		// get children before modification
-		List<EObject> originalChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
-		if (canMove) {
-			Assert.assertTrue("Command should be executable", command.canExecute());
-			IStatus status = command.execute(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			// get result
-			List<EObject> afterCreationChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
-			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have only one more element", 1, delta.size());
-			// check it does not impact undo
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterUndoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
-			delta = new ArrayList<EObject>(afterUndoChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have no element", 0, delta.size());
-			// should be redoable
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterRedoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
-			delta = new ArrayList<EObject>(afterRedoChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have one more element", 1, delta.size());
-			// undo to revert state
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-		} else {
-			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
-		}
-	}
-
-	@Test
-	public void testDeleteComponentFromWrongPackage() throws ExecutionException {
-		// should be possible. no influence on deletion is expected
-		testDeleteComponent(component1_packageWithAllElements, true);
-	}
-
-	@Test
-	public void testDeleteComponentFromGoodPackage() throws ExecutionException {
-		// should be possible. no influence on deletion is expected
-		testDeleteComponent(component1_packageWithComponents, true);
-	}
-
-	protected void testDeleteComponent(EObject objectToDelete, boolean canDelete) throws ExecutionException {
-		IProgressMonitor monitor = new NullProgressMonitor();
-		// should be possible
-		DestroyElementRequest request = new DestroyElementRequest(transactionalEditingDomain, objectToDelete, false);
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(objectToDelete);
-		ICommand command = service.getEditCommand(request);
-		// get children before modification
-		List<EObject> originalChildren = new ArrayList<EObject>((List<EObject>) objectToDelete.eContainer().eGet(objectToDelete.eContainingFeature(), true));
-		EObject container = objectToDelete.eContainer();
-		EStructuralFeature containingFeature = objectToDelete.eContainingFeature();
-		if (canDelete) {
-			Assert.assertTrue("Command should be executable", command.canExecute());
-			IStatus status = command.execute(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			// get result
-			List<EObject> afterDeletionChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
-			List<EObject> delta = new ArrayList<EObject>(originalChildren);
-			delta.removeAll(afterDeletionChildren);
-			Assert.assertEquals("List should have one element only", 1, delta.size());
-			Assert.assertEquals("deleted element should be the specified one", objectToDelete, delta.get(0));
-			// check it does not impact undo
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterUndoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
-			delta = new ArrayList<EObject>(afterUndoChildren);
-			delta.removeAll(originalChildren);
-			Assert.assertEquals("List should have no element", 0, delta.size());
-			// should be redoable
-			Assert.assertTrue("Command should be redoable", command.canRedo());
-			status = command.redo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-			List<EObject> afterRedoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
-			delta = new ArrayList<EObject>(originalChildren);
-			delta.removeAll(afterRedoChildren);
-			Assert.assertEquals("List should have one more element", 1, delta.size());
-			// undo to revert state
-			Assert.assertTrue("Command should be undoable", command.canUndo());
-			status = command.undo(monitor, null);
-			Assert.assertTrue("Status should be OK", status.isOK());
-		} else {
-			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
-		}
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ * 

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.List;

+

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

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

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

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.URI;

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

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

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

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

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

+import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.AdviceComparator;

+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

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

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

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Package;

+import org.junit.Assert;

+import org.junit.Test;

+

+/**

+ * Based upon ExtendedEditHelperAdviceTests

+ * Test class for element type edit helper advice

+ */

+public class ElementEditHelperAdviceTests extends AbstractElementTypeTests implements ITestConstants {

+

+	@Test

+	// transcoded from extended types framework

+	public void testPACKAGE_WITH_COMPONENTSType() {

+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithComponents, papyrusContext));

+		Assert.assertNotNull("list should not be null", elementTypes);

+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);

+		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));

+	}

+

+	@Test

+	public void testPACKAGE_WITH_ALL_ELEMENTSType() {

+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));

+		Assert.assertNotNull("list should not be null", elementTypes);

+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);

+		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));

+	}

+

+	@Test

+	// transcoded from extended types framework

+	public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {

+		testCreateComponent(packageWithComponents, true);

+	}

+

+	@Test

+	// transcoded from extended types framework

+	public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {

+		testCreateComponent(packageWithAllElements, false);

+	}

+

+	protected void testCreateComponent(Package container, boolean canCreate) throws ExecutionException {

+		IProgressMonitor monitor = new NullProgressMonitor();

+		// should be possible

+		IElementType type = ElementTypeRegistry.getInstance().getType(SPECIFICCOMPONENT_TYPE_ID);

+		CreateElementRequest request = new CreateElementRequest(transactionalEditingDomain, container, type);

+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(container);

+		ICommand command = service.getEditCommand(request);

+		// get children before modification

+		List<EObject> originalChildren = new ArrayList<EObject>(container.getPackagedElements());

+		if (canCreate) {

+			Assert.assertTrue("Command should be executable", command.canExecute());

+			IStatus status = command.execute(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			// get result

+			List<EObject> afterCreationChildren = new ArrayList<EObject>(container.getPackagedElements());

+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have only one more element", 1, delta.size());

+			// check it does not impact undo

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterUndoChildren = new ArrayList<EObject>(container.getPackagedElements());

+			delta = new ArrayList<EObject>(afterUndoChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have no element", 0, delta.size());

+			// should be redoable

+			Assert.assertTrue("Command should be redoable", command.canRedo());

+			status = command.redo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterRedoChildren = new ArrayList<EObject>(container.getPackagedElements());

+			delta = new ArrayList<EObject>(afterRedoChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have one more element", 1, delta.size());

+			// undo to revert state

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+		} else {

+			Assert.assertTrue("Command should not be executable", command == null || !(command.canExecute()));

+		}

+	}

+

+	@Test

+	public void testSemanticMoveComponentFromGoodPackageToGoodPackage() throws ExecutionException {

+		// should be possible (target = good package)

+		testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);

+	}

+

+	@Test

+	// transcoded from extended types framework

+	public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {

+		// should be impossible (target = wrong package)

+		testMoveComponent(packageWithAllElements, component1_packageWithComponents, false);

+	}

+

+	@Test

+	public void testSemanticMoveComponentFromWrongPackageToGoodPackage() throws ExecutionException {

+		// should be possible (target = good package)

+		testMoveComponent(packageWithComponents, component1_packageWithAllElements, true);

+	}

+

+	@Test

+	public void testSemanticMoveComponentFromWrongPackageToWrongPackage() throws ExecutionException {

+		// should be impossible (target = wrong package)

+		testMoveComponent(packageWithAllElements, component1_packageWithAllElements, false);

+	}

+

+	protected void testMoveComponent(Package targetContainer, Component sourceComponent, boolean canMove) throws ExecutionException {

+		IProgressMonitor monitor = new NullProgressMonitor();

+		// should be possible

+		MoveRequest request = new MoveRequest(transactionalEditingDomain, targetContainer, sourceComponent);

+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(targetContainer);

+		ICommand command = service.getEditCommand(request);

+		// get children before modification

+		List<EObject> originalChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

+		if (canMove) {

+			Assert.assertTrue("Command should be executable", command.canExecute());

+			IStatus status = command.execute(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			// get result

+			List<EObject> afterCreationChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have only one more element", 1, delta.size());

+			// check it does not impact undo

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterUndoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

+			delta = new ArrayList<EObject>(afterUndoChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have no element", 0, delta.size());

+			// should be redoable

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterRedoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

+			delta = new ArrayList<EObject>(afterRedoChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have one more element", 1, delta.size());

+			// undo to revert state

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+		} else {

+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());

+		}

+	}

+

+	@Test

+	public void testDeleteComponentFromWrongPackage() throws ExecutionException {

+		// should be possible. no influence on deletion is expected

+		testDeleteComponent(component1_packageWithAllElements, true);

+	}

+

+	@Test

+	public void testDeleteComponentFromGoodPackage() throws ExecutionException {

+		// should be possible. no influence on deletion is expected

+		testDeleteComponent(component1_packageWithComponents, true);

+	}

+

+	protected void testDeleteComponent(EObject objectToDelete, boolean canDelete) throws ExecutionException {

+		IProgressMonitor monitor = new NullProgressMonitor();

+		// should be possible

+		DestroyElementRequest request = new DestroyElementRequest(transactionalEditingDomain, objectToDelete, false);

+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(objectToDelete);

+		ICommand command = service.getEditCommand(request);

+		// get children before modification

+		List<EObject> originalChildren = new ArrayList<EObject>((List<EObject>) objectToDelete.eContainer().eGet(objectToDelete.eContainingFeature(), true));

+		EObject container = objectToDelete.eContainer();

+		EStructuralFeature containingFeature = objectToDelete.eContainingFeature();

+		if (canDelete) {

+			Assert.assertTrue("Command should be executable", command.canExecute());

+			IStatus status = command.execute(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			// get result

+			List<EObject> afterDeletionChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

+			List<EObject> delta = new ArrayList<EObject>(originalChildren);

+			delta.removeAll(afterDeletionChildren);

+			Assert.assertEquals("List should have one element only", 1, delta.size());

+			Assert.assertEquals("deleted element should be the specified one", objectToDelete, delta.get(0));

+			// check it does not impact undo

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterUndoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

+			delta = new ArrayList<EObject>(afterUndoChildren);

+			delta.removeAll(originalChildren);

+			Assert.assertEquals("List should have no element", 0, delta.size());

+			// should be redoable

+			Assert.assertTrue("Command should be redoable", command.canRedo());

+			status = command.redo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+			List<EObject> afterRedoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

+			delta = new ArrayList<EObject>(originalChildren);

+			delta.removeAll(afterRedoChildren);

+			Assert.assertEquals("List should have one more element", 1, delta.size());

+			// undo to revert state

+			Assert.assertTrue("Command should be undoable", command.canUndo());

+			status = command.undo(monitor, null);

+			Assert.assertTrue("Status should be OK", status.isOK());

+		} else {

+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());

+		}

+	}

+

+	@Test

+	public void testValidAdvicesOrder() {

+		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");

+		ResourceSet resourceSet = new ResourceSetImpl();

+		Resource validAdviesOrderConfigurationResource = resourceSet.getResource(URI.createURI(VALID_ADVICES_ORDER_CONFIGURATIONS), true);

+		EObject root = validAdviesOrderConfigurationResource.getContents().get(0);

+		if (root instanceof ElementTypeSetConfiguration) {

+

+			try {

+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) root);

+			} catch (ServiceException e) {

+				// TODO Auto-generated catch block

+				e.printStackTrace();

+			}

+			IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

+			Arrays.sort(advicesAfterLoading, new AdviceComparator());

+

+			int advice1Index = -1;

+			int advice2Index = -1;

+			int advice3Index = -1;

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

+				IEditHelperAdvice iEditHelperAdvice = advicesAfterLoading[i];

+				if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_1)) {

+					advice1Index = i;

+				} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_2)) {

+					advice2Index = i;

+				} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_3)) {

+					advice3Index = i;

+				}

+			}

+

+			Assert.assertTrue(ADVICES_ID_2 + " should be after " + ADVICES_ID_3, advice3Index < advice2Index);

+			Assert.assertTrue(ADVICES_ID_3 + " should be after " + ADVICES_ID_1, advice2Index < advice1Index);

+		} else {

+			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);

+		}

+	}

+

+	@Test

+	public void testCyclicAdvices() {

+		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");

+		IEditHelperAdvice[] advicesBeforeLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

+		ResourceSet resourceSet = new ResourceSetImpl();

+		Resource cyclicAdvicesConfigurationResource = resourceSet.getResource(URI.createURI(CYCLIC_ADVICES_CONFIGURATIONS), true);

+		org.eclipse.emf.ecore.EObject root = cyclicAdvicesConfigurationResource.getContents().get(0);

+		if (root instanceof ElementTypeSetConfiguration) {

+			try {

+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) root);

+			} catch (ServiceException e) {

+				// TODO Auto-generated catch block

+				e.printStackTrace();

+			}

+			IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

+			Assert.assertArrayEquals("Advices for UML::Class should have not been changed: ", advicesBeforeLoading, advicesAfterLoading);

+		} else {

+			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);

+		}

+	}

+}
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
index ddb483835c4..6c0f7d518dc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
@@ -37,4 +37,4 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 		IElementType abstractClassType = ElementTypeRegistry.getInstance().getType(ABSTRACT_CLASS_TOOL);
 		Assert.assertNotNull("Element type should be registered", abstractClassType);
 	}
-}
+}
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
index 9e723e65591..449ab399284 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
@@ -21,7 +21,7 @@ public interface ITestConstants {
 	final static String ABSTRACT_CLASS_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"; //$NON-NLS-1$
 
 	final static String ElementTypeConfigurationSetName_Test1 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"; //$NON-NLS-1$
-	
+
 	final static String WORKSPACE_ELEMENT_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype"; //$NON-NLS-1$
 
 	final static String WORKSPACE_ELEMENT_TYPE_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool"; //$NON-NLS-1$
@@ -38,4 +38,13 @@ public interface ITestConstants {
 
 	static final String COMPONENT_NAME = "Component1"; //$NON-NLS-1$
 
+	static final String CYCLIC_ADVICES_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations";
+
+	static final String VALID_ADVICES_ORDER_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations";
+
+	static final String ADVICES_ID_1 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1";
+	static final String ADVICES_ID_2 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2";
+	static final String ADVICES_ID_3 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3";
+
+
 }
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice1.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice1.java
new file mode 100644
index 00000000000..1b9f3e552ab
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice1.java
@@ -0,0 +1,20 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST 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 LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+

+public class TestEditHelperAdvice1 extends AbstractEditHelperAdvice {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice2.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice2.java
new file mode 100644
index 00000000000..a4472a6125d
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice2.java
@@ -0,0 +1,20 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST 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 LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+

+public class TestEditHelperAdvice2 extends AbstractEditHelperAdvice {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice3.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice3.java
new file mode 100644
index 00000000000..cfa4994160d
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice3.java
@@ -0,0 +1,20 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST 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 LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+

+public class TestEditHelperAdvice3 extends AbstractEditHelperAdvice {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF
index 619a5e42414..c6ed73d54d2 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.elementtypesconfigurations.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.core
 Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java
index 938a12326af..135f2ecc549 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java
@@ -23,10 +23,11 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.preferences.ElementTypesPreferences;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AbstractElementTypeTests;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.tests.ITestConstants;
+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -59,14 +60,25 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 	}
 
 	/**
+	 * Test registration based on plugin declaration
+	 */
+	@Test
+	// transcoded from extended types framework
+	public final void testGetTypeRegisteredInplugin() {
+		// check standard class
+		IElementType classType = ElementTypeRegistry.getInstance().getType(ORG_ECLIPSE_PAPYRUS_UML_CLASS);
+		Assert.assertNotNull("Element type should be registered", classType);
+		IElementType abstractClassType = ElementTypeRegistry.getInstance().getType(ABSTRACT_CLASS_TOOL);
+		Assert.assertNotNull("Element type should be registered", abstractClassType);
+	}
+
+	/**
 	 * Test workspace registration. Element type in the workspace, but element type set is not loaded
 	 */
 	@Test
 	// transcoded from extended types framework
 	public final void testGetTypeRegisteredInWorkspaceNotLoaded() {
 		checkPluginTypes();
-		// no preference should be set for this test
-		ElementTypesPreferences.unregisterWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID);
 		// this should not be defined yet
 		IElementType workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
 		Assert.assertNull("Element type should not be registered yet", workspaceType);
@@ -83,19 +95,22 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 		Assert.assertNull("Element type should not be registered yet", workspaceType);
 		checkPluginTypes();
 		// register
-		System.out.println(WORKSPACE_ELEMENT_TYPE_ID + "=" + workspaceTestFile.getFullPath().toString());
-		ElementTypesPreferences.registerWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID, workspaceTestFile.getFullPath().toString());
-		ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(WORKSPACE_ELEMENT_TYPE_ID);
-		//
-		workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
-		Assert.assertNotNull("Element type should be registered", workspaceType);
-		checkPluginTypes();
-		// unregister
-		ElementTypesPreferences.unregisterWorkspaceDefinition(WORKSPACE_ELEMENT_TYPE_ID);
-		ElementTypeSetConfigurationRegistry.getInstance().unload(WORKSPACE_ELEMENT_TYPE_ID);
-		workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
-		Assert.assertNull("Element type should not be registered anymore", workspaceType);
-		checkPluginTypes();
+		try {
+			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), workspaceTestFile.getFullPath().toString());
+
+			//
+			workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+			Assert.assertNotNull("Element type should be registered", workspaceType);
+			checkPluginTypes();
+			// unregister
+			ElementTypeSetConfigurationRegistry.getInstance().unload(TypeContext.getContext().getId(), WORKSPACE_ELEMENT_TYPE_ID);
+			workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
+			Assert.assertNull("Element type should not be registered anymore", workspaceType);
+			checkPluginTypes();
+		} catch (ServiceException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -107,4 +122,6 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 		IElementType abstractClassType = ElementTypeRegistry.getInstance().getType(ABSTRACT_CLASS_TOOL);
 		Assert.assertNotNull("Element type should be registered", abstractClassType);
 	}
+
+
 }
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
index 081968a289c..a32806e8cfa 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
@@ -14,11 +14,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.assistant.tests;
 
 import java.net.URL;
-import java.util.Collections;
+import java.util.HashMap;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
 import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
@@ -26,6 +27,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.core.IModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.DefaultModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.ModelingAssistantModelRegistry;
+import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
 import org.eclipse.papyrus.junit.utils.JUnitUtils;
 import org.eclipse.uml2.uml.util.UMLUtil;
 import org.junit.rules.TestWatcher;
@@ -61,10 +63,27 @@ public class AssistantsFixture extends TestWatcher {
 		URI elementTypesModelURI = getModelURI(assistantsModelPath.replaceFirst("\\.assistants$", ".elementtypesconfigurations"), description);
 		if (elementTypesModelURI != null) {
 			ElementTypeSetConfiguration elementTypes = UMLUtil.load(resourceSet, elementTypesModelURI, ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
-			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfigurations(Collections.singleton(elementTypes));
+
+			try {
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) elementTypes);
+			} catch (ServiceException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 
 			elementTypesID = JUnitUtils.getTestClass(description).getName();
-			ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().put(elementTypesID, elementTypes);
+
+			try {
+				String contextId = TypeContext.getContext().getId();
+
+				if (!ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().containsKey(contextId)) {
+					ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().put(contextId, new HashMap<String, ElementTypeSetConfiguration>());
+				}
+				ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().get(contextId).put(elementTypesID, elementTypes);
+			} catch (ServiceException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		// And then the assistants that reference them
@@ -89,7 +108,14 @@ public class AssistantsFixture extends TestWatcher {
 		assistantModelProvider = null;
 
 		if (elementTypesID != null) {
-			ElementTypeSetConfigurationRegistry.getInstance().unload(elementTypesID);
+			try {
+				String contextId = TypeContext.getContext().getId();
+
+				ElementTypeSetConfigurationRegistry.getInstance().unload(contextId, elementTypesID);
+			} catch (ServiceException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
 
 		EMFHelper.unload(resourceSet);
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
index 4760815ced0..8ed905b33b7 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
@@ -4,7 +4,7 @@
    <extension

          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

       <elementTypeSet

-            id="org.eclipse.papyrus.infra.gmfdiag.common.tests.testexpansiondiagram"

+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

             path="models/TestExpansionDiagram.elementtypesconfigurations">

       </elementTypeSet>

    </extension>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
index 013e1243d48..626214771f3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.elementTypeSet"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resources/TestPalette.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
@@ -33,7 +33,7 @@
 <extension
          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.elementTypeSet"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resources/FakeProfile.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
index 0cb788ff33b..fc0db65c2a3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
@@ -7,9 +7,9 @@
     xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
     xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
     xmi:id="_ubJcsKeUEeSUR5jX0TaAcA"
-    name="TestPaletteConfiguration"
+    name="FakeProfile"
     description="Element types configuration for test palette configuration plugin"
-    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"
+    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
index 9846199b7dc..4ba0f0e10c6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
@@ -9,7 +9,7 @@
     xmi:id="_ubJcsKeUEeSUR5jX0TaAcA"
     name="TestPaletteConfiguration"
     description="Element types configuration for test palette configuration plugin"
-    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests"
+    identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration"
     metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"