Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*

Bug 499554 - Oxygen release version number moved to 3.0.0.

Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007

191 files changed, 2077 insertions, 7749 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 08ba9080c47..6338ab1f07d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -35,27 +35,26 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,

  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",

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

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

  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",

  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",

+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,

  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",

- org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

  org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,

- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 2.0.0.qualifier

+Bundle-Version: 3.0.0.qualifier

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin

 Bundle-ManifestVersion: 2

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

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java
index 0eea602fae7..91bbd30b6a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java
@@ -54,8 +54,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.INotification;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.NotificationRunnable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingInCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingInCreationEditPolicy.java
index 3a1a02d8011..76069fddc96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingInCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingInCreationEditPolicy.java
@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.activity.activitygroup.ContainerNodeDescriptorRegistry;

 import org.eclipse.papyrus.uml.diagram.activity.activitygroup.GroupRequestAdvisor;

 import org.eclipse.papyrus.uml.diagram.activity.activitygroup.IContainerNodeDescriptor;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java
index b0407a37224..832cc9fc19b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/handlers/SynchronizePinsParametersHandler.java
@@ -55,7 +55,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.ui.util.EditorUtils;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;
 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;
@@ -220,7 +220,7 @@ public class SynchronizePinsParametersHandler extends AbstractSynchronizePinsAnd
 		}
 		// The command that is going to be executed.
 		CompoundCommand linkingPinsAndParamsCommand = new CompoundCommand();
-		//		CompositeTransactionalCommand linkingPinsAndParamsCommand = new CompositeTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Pin synchronization");////$NON-NLS-1$
+		// CompositeTransactionalCommand linkingPinsAndParamsCommand = new CompositeTransactionalCommand(EditorUtils.getTransactionalEditingDomain(), "Pin synchronization");////$NON-NLS-1$
 		if (invocationAction instanceof CallAction) {
 			CallAction callAction = (CallAction) invocationAction;
 			List<Parameter> callActionParams = getParametersFromCallAction(callAction);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java
index 197687ce7e6..0b410c7c61a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ExceptionHandlerListener.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.command.SetCommand;

 import org.eclipse.emf.transaction.NotificationFilter;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.listeners.AbstractPapyrusModifcationTriggerListener;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.ExceptionHandler;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java
index a614584110f..8bd533caff7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/InInterruptibleActivityRegionListener.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.transaction.NotificationFilter;

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.Type;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java
index 5ba7ce1c85c..661c76396e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectFlowListener.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.transaction.NotificationFilter;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.listeners.AbstractPapyrusModifcationTriggerListener;

 import org.eclipse.uml2.uml.LiteralBoolean;

 import org.eclipse.uml2.uml.LiteralInteger;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java
index 9386fc37674..9e9dd655c3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/listeners/ObjectNodeListener.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

 import org.eclipse.emf.transaction.NotificationFilter;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.listeners.AbstractPapyrusModifcationTriggerListener;

 import org.eclipse.uml2.uml.LiteralInteger;

 import org.eclipse.uml2.uml.ObjectNode;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
index 51a35e67e79..8981218f670 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.activity</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.activity</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java
deleted file mode 100644
index c225876d5a1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class AcceptEventActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public AcceptEventActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_AcceptEventAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_AcceptEventAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java
deleted file mode 100644
index aa77b9bd539..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class ActionInputPinPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ActionInputPinPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ActionInputPin");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated not
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ActionInputPin";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 16);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java
deleted file mode 100644
index acf277ed4aa..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ActivityCNPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "ActivityFigureContentCompartment", "ActivityFigureParameterCompartment", "ActivityFigurePreconditionCompartment", "ActivityFigurePostCondtionCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public ActivityCNPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ActivityCN");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		UMLDiagramEditorPlugin.getInstance();
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityCN";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);
-		for (String name : compartments) {
-			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, true);
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java
deleted file mode 100644
index d918feb93e1..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class ActivityFinalNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ActivityFinalNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ActivityFinalNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityFinalNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java
deleted file mode 100644
index b637e3c2e8b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ActivityParameterNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ActivityParameterNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ActivityParameterNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityParameterNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java
deleted file mode 100644
index 9156751d58e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityGroup;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class ActivityPartitionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "ActivityPartitionContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public ActivityPartitionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ActivityPartition");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityPartition";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("ActivityPartitionContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	/**
-	 * Add the opacity group preference
-	 * Remove the background color group
-	 *
-	 * @generated not
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 *
-	 * @param parent
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		OpacityGroup transparancyGroup = new OpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_ACTIVITY_PARTITION_ALPHA);
-		addAbstractGroup(transparancyGroup);
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java
deleted file mode 100644
index 3197dda5ad9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ActivityPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "ActivityFigureParameterCompartment", "ActivityFigurePreconditionCompartment", "ActivityFigurePostCondtionCompartment", "ActivityFigureContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public ActivityPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_Activity");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_Activity";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 857);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 757);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("ActivityFigureParameterCompartment", Boolean.TRUE);
-		map.put("ActivityFigurePreconditionCompartment", Boolean.TRUE);
-		map.put("ActivityFigurePostCondtionCompartment", Boolean.TRUE);
-		map.put("ActivityFigureContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java
deleted file mode 100644
index 0708c380862..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class AddStructuralFeatureValueActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public AddStructuralFeatureValueActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_AddStructuralFeatureValueAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_AddStructuralFeatureValueAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java
deleted file mode 100644
index b4b161a48f0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class AddVariableValueActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public AddVariableValueActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_AddVariableValueAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_AddVariableValueAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java
deleted file mode 100644
index ad9314543dc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class BroadcastSignalActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public BroadcastSignalActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_BroadcastSignalAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_BroadcastSignalAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java
deleted file mode 100644
index e8c9cf7b81e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class CallBehaviorActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public CallBehaviorActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_CallBehaviorAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_CallBehaviorAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java
deleted file mode 100644
index dea46b2dcf4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class CallOperationActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public CallOperationActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_CallOperationAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_CallOperationAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java
deleted file mode 100644
index 7c45cace14d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class CentralBufferNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public CentralBufferNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_CentralBufferNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_CentralBufferNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java
deleted file mode 100644
index 9577a131992..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_Comment");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_Comment";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java
deleted file mode 100644
index f4804b48339..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityFactoryHelper;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class ConditionalNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "StructuredActivityNodeContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public ConditionalNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ConditionalNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ConditionalNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("StructuredActivityNodeContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	/**
-	 * Add the SpecificKeywordStructuredActivityNodeVisibility preference
-	 * Add the opacity group preference
-	 * Remove the background color group
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 *
-	 * @param parent
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		// Add opacity Group
-		addAbstractGroup(OpacityFactoryHelper.getOpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_CONDITIONAL_NODE_ALPHA));
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-		// label visibility
-		SpecificKeywordStructuredActivityNodeVisibility specificKeywordDisplay = new SpecificKeywordStructuredActivityNodeVisibility(parent, getTitle(), this, SpecificKeywordStructuredActivityNodeVisibility.ElementType.CONDITIONAL_NODE);
-		addAbstractGroup(specificKeywordDisplay);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 689550d7820..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_Constraint");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_Constraint";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java
deleted file mode 100644
index 57dca1bad85..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class ControlFlowPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ControlFlowPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ControlFlow");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ControlFlow";
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Weight", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Guard", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Name", Boolean.FALSE);//$NON-NLS-1$
-		map.put("Weight", Boolean.FALSE);//$NON-NLS-1$
-		map.put("Guard", Boolean.TRUE);
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-
-	/**
-	 * Create preference page content concerning object flows
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 * @param parent
-	 *            parent composite
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		super.createPageContents(parent);
-		// label visibility
-		ActivityEdgeLabelVisibilityGroup connectionGroupComposite = new ActivityEdgeLabelVisibilityGroup(parent, getTitle(), this);
-		addAbstractGroup(connectionGroupComposite);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java
deleted file mode 100644
index 8501981f222..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class CreateObjectActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public CreateObjectActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_CreateObjectAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_CreateObjectAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java
deleted file mode 100644
index a3f73bdc5ac..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DataStoreNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DataStoreNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_DataStoreNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_DataStoreNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java
deleted file mode 100644
index 4908b09f9d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class DecisionNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DecisionNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_DecisionNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_DecisionNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java
deleted file mode 100644
index f1e14c4e61a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DestroyObjectActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DestroyObjectActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_DestroyObjectAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_DestroyObjectAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java
deleted file mode 100644
index 75cfb705a1d..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DurationConstraintPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_DurationConstraint");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_DurationConstraint";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExceptionHandlerPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExceptionHandlerPreferencePage.java
deleted file mode 100644
index 61261d47ee0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExceptionHandlerPreferencePage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ExceptionHandlerPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ExceptionHandlerPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ExceptionHandler");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java
deleted file mode 100644
index 425535750bc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ExpansionNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ExpansionNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ExpansionNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ExpansionNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 48);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 16);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java
deleted file mode 100644
index ad6ffd5ae8e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityFactoryHelper;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class ExpansionRegionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "StructuredActivityNodeContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public ExpansionRegionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ExpansionRegion");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ExpansionRegion";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("StructuredActivityNodeContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	/**
-	 * Add the SpecificKeywordStructuredActivityNodeVisibility preference
-	 * Add the opacity group preference
-	 * Remove the background color group
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 *
-	 * @param parent
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		// Add opacity Group
-		addAbstractGroup(OpacityFactoryHelper.getOpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_EXPANSION_REGION_ALPHA));
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java
deleted file mode 100644
index 351ff629b6e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class FlowFinalNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public FlowFinalNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_FlowFinalNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_FlowFinalNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java
deleted file mode 100644
index 78ffb24d0f5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class ForkNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ForkNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ForkNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ForkNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 10);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java
deleted file mode 100644
index 7a3310d72a5..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class InitialNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public InitialNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_InitialNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_InitialNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java
deleted file mode 100644
index de72b1ec3d2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class InputPinPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public InputPinPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_InputPin");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated not
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_InputPin";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 16);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java
deleted file mode 100644
index 5de94f8a072..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class InteractionConstraintPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_InteractionConstraint");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		UMLDiagramEditorPlugin.getInstance();
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_InteractionConstraint";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java
deleted file mode 100644
index fe19a43766f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class InterruptibleActivityRegionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "InterruptibleActivityRegionContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public InterruptibleActivityRegionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_InterruptibleActivityRegion");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_InterruptibleActivityRegion";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("InterruptibleActivityRegionContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java
deleted file mode 100644
index c2c8894fc21..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class IntervalConstraintPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_IntervalConstraint");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_IntervalConstraint";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java
deleted file mode 100644
index b148c1b2252..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class JoinNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public JoinNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_JoinNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_JoinNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 10);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java
deleted file mode 100644
index f1515dc0957..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityFactoryHelper;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class LoopNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "StructuredActivityNodeContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public LoopNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_LoopNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_LoopNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("StructuredActivityNodeContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	/**
-	 * Add the SpecificKeywordStructuredActivityNodeVisibility preference
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 *
-	 * @param parent
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		// Add opacity Group
-		addAbstractGroup(OpacityFactoryHelper.getOpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_LOOP_NODE_ALPHA));
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-		SpecificKeywordStructuredActivityNodeVisibility specificKeywordDisplay = new SpecificKeywordStructuredActivityNodeVisibility(parent, getTitle(), this, SpecificKeywordStructuredActivityNodeVisibility.ElementType.LOOP_NODE);
-		addAbstractGroup(specificKeywordDisplay);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java
deleted file mode 100644
index 5494dc4f7f3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class MergeNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public MergeNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_MergeNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_MergeNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java
deleted file mode 100644
index dd3c4ebec59..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class ObjectFlowPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ObjectFlowPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ObjectFlow");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ObjectFlow";
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Weight", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Selection", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Transformation", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("DecisionInputFlow", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Guard", "");//$NON-NLS-1$ //$NON-NLS-2$
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Name", Boolean.FALSE);//$NON-NLS-1$
-		map.put("Weight", Boolean.FALSE);//$NON-NLS-1$
-		map.put("Selection", Boolean.TRUE);
-		map.put("Transformation", Boolean.TRUE);
-		map.put("DecisionInputFlow", Boolean.TRUE);
-		map.put("Guard", Boolean.FALSE);//$NON-NLS-1$
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-
-	/**
-	 * Create preference page content concerning object flows
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 * @param parent
-	 *            parent composite
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		super.createPageContents(parent);
-		// label visibility
-		ActivityEdgeLabelVisibilityGroup connectionGroupComposite = new ActivityEdgeLabelVisibilityGroup(parent, getTitle(), this);
-		addAbstractGroup(connectionGroupComposite);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java
deleted file mode 100644
index f42df52b586..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class OpaqueActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public OpaqueActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_OpaqueAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_OpaqueAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java
deleted file mode 100644
index cbb20c5602f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class OutputPinPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public OutputPinPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_OutputPin");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated not
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_OutputPin";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 16);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java
deleted file mode 100644
index 02fe96b7fe9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ParameterPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ParameterPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_Parameter");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_Parameter";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java
deleted file mode 100644
index b568d143f66..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ReadSelfActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ReadSelfActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ReadSelfAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadSelfAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java
deleted file mode 100644
index 4df932c2f38..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ReadStructuralFeatureActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ReadStructuralFeatureActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ReadStructuralFeatureAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadStructuralFeatureAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java
deleted file mode 100644
index 9df29850cd3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ReadVariableActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ReadVariableActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ReadVariableAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadVariableAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java
deleted file mode 100644
index f4c00cc4821..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class SendObjectActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public SendObjectActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_SendObjectAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_SendObjectAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java
deleted file mode 100644
index 1584a1bb1ba..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class SendSignalActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public SendSignalActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_SendSignalAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_SendSignalAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java
deleted file mode 100644
index bd8c11c3d02..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityFactoryHelper;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class SequenceNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "StructuredActivityNodeContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public SequenceNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_SequenceNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_SequenceNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("StructuredActivityNodeContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	/**
-	 * Add the SpecificKeywordStructuredActivityNodeVisibility preference
-	 * Add the opacity group preference
-	 * Remove the background color group
-	 *
-	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage#createPageContents(org.eclipse.swt.widgets.Composite)
-	 *
-	 * @param parent
-	 * @generated NOT
-	 */
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		// Add opacity Group
-		addAbstractGroup(OpacityFactoryHelper.getOpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_SEQUENCE_NODE_ALPHA));
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-		SpecificKeywordStructuredActivityNodeVisibility specificKeywordDisplay = new SpecificKeywordStructuredActivityNodeVisibility(parent, getTitle(), this, SpecificKeywordStructuredActivityNodeVisibility.ElementType.SEQUENCE_NODE);
-		addAbstractGroup(specificKeywordDisplay);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java
deleted file mode 100644
index 97362360949..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class ShapeNamedElementPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ShapeNamedElementPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ShapeNamedElement");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ShapeNamedElement";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Name", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java
deleted file mode 100644
index 451095297ad..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LabelGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeCompartmentGroup;
-import org.eclipse.papyrus.uml.diagram.activity.activitygroup.preferences.OpacityFactoryHelper;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @generated
- */
-public class StructuredActivityNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public static final String compartments[] = { "StructuredActivityNodeContentCompartment" };
-
-	/**
-	 * @generated
-	 */
-	public StructuredActivityNodePreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_StructuredActivityNode");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_StructuredActivityNode";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		map = getStaticCompartmentTitleVisibilityPreferences();
-		for (String name : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(preferenceName, map.get(name));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeCompartmentsList() {
-		for (String name : compartments) {
-			this.compartmentsList.add(name);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("StructuredActivityNodeContentCompartment", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return getStaticCompartmentTitleVisibilityPreferences();
-	}
-
-	@Override
-	protected void createPageContents(Composite parent) {
-		FontGroup fontGroupComposite = new FontGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(fontGroupComposite);
-		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(colorGroupForNodeComposite);
-		// Add opacity Group
-		addAbstractGroup(OpacityFactoryHelper.getOpacityGroup(parent, getPreferenceKey(), this, IActivityPreferenceConstants.PREF_STRUCTURED_NODE_ALPHA));
-		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);
-		addAbstractGroup(decorationGroup);
-		if (!compartmentsList.isEmpty()) {
-			NodeCompartmentGroup compartmentGroup = new NodeCompartmentGroup(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-		// Label role group
-		if (!getLabelRole().isEmpty()) {
-			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());
-			addAbstractGroup(compartmentGroup);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java
deleted file mode 100644
index de8619c73ca..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class TimeConstraintPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_TimeConstraint");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_TimeConstraint";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java
deleted file mode 100644
index f09d95d5164..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
-
-/**
- * @generated
- */
-public class ValuePinPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ValuePinPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ValuePin");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated not
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ValuePin";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 16);
-		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();
-		for (String role : map.keySet()) {
-			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(preferenceName, map.get(role));
-		}
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, String> getStaticLabelRole() {
-		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());
-		map.put("Stereotype", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif");//$NON-NLS-1$
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static TreeMap<String, Boolean> getStaticLabelVisibilityPreferences() {
-		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
-		map.put("Stereotype", Boolean.TRUE);
-		return map;
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected TreeMap<String, String> getLabelRole() {
-		return getStaticLabelRole();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java
deleted file mode 100644
index efbe8e8b49b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class ValueSpecificationActionPreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/**
-	 * @generated
-	 */
-	public ValueSpecificationActionPreferencePage() {
-		super();
-		setPreferenceKey(ActivityDiagramEditPart.MODEL_ID + "_ValueSpecificationAction");
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected String getBundleId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		String key = ActivityDiagramEditPart.MODEL_ID + "_ValueSpecificationAction";
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,
-		// org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
-		// Set the default for the gradient
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY),false);
-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
-		// new org.eclipse.swt.graphics.RGB(255, 255, 255),
-		// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
-		// store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT),
-		// gradientPreferenceConverter.getPreferenceValue());
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 15b451cda3d..26146381d22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -33,9 +33,9 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
@@ -46,7 +46,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomDropAppliedStereotypeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomDropAppliedStereotypeCommand.java
index 7bc7d07ce20..9a3cb22f8a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomDropAppliedStereotypeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomDropAppliedStereotypeCommand.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 

 /**

  * The Class customDiferedAppliedStereotypeCommand use to display the applied stereotype.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
index 12bf490a8dc..2919258f3be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,
  org.eclipse.papyrus.uml.diagram.common.groups.preferences,
  org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,
  org.eclipse.papyrus.uml.diagram.common.groups.utils
-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
index c18659591cd..98846c5a5f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.common.groups</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.common.groups</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
index 3ad08aa9076..342a10b7427 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseChildrenNotificationConfigurator.java
@@ -25,7 +25,7 @@ import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.ICompositeCreator;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

 import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
index b7df7e5cb36..f4e07fbb988 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/core/ui/ChooseParentNotificationConfigurator.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.IContext;

 import org.eclipse.papyrus.uml.diagram.common.groups.Messages;

 import org.eclipse.papyrus.uml.diagram.common.groups.commands.ChangeGraphicalParentCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
index d25ded09846..11d529ef2d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.papyrus.uml.diagram.common.palette.customaction.providers,
  org.eclipse.papyrus.uml.diagram.common.palette.customaction.swt,
  org.eclipse.papyrus.uml.diagram.common.palette.customaction.toolbox,
  org.eclipse.papyrus.uml.diagram.common.palette.customaction.utils
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
index fc2dc566065..77ef95e8521 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.palette.customaction/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.common.palette.customaction</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.common.palette.customaction</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 25d71a48a6d..1e6c3452778 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -51,39 +51,39 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.localizer;bundle-version="[1.2.0,2.0.0)",
  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Eclipse-BuddyPolicy: dependent
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
index c14b9fc6bd6..c6db74cc8dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AbstractCommonTransactionalCommmand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AbstractCommonTransactionalCommmand.java
index 7331da7e234..4ca81edd57a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AbstractCommonTransactionalCommmand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/AbstractCommonTransactionalCommmand.java
@@ -1,71 +1,71 @@
-/*******************************************************************************
- * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,
- * Generalitat de la Comunitat Valenciana .
- * 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: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation
- *
- ******************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.commands;
-
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-
-/**
- * An <AbstractTransactionalCommand> that can give proxies for EMF and GEF.
- *
- * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>
- *
- */
-public abstract class AbstractCommonTransactionalCommmand extends AbstractTransactionalCommand {
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param domain
-	 * @param label
-	 * @param affectedFiles
-	 */
-	public AbstractCommonTransactionalCommmand(TransactionalEditingDomain domain, String label, List affectedFiles) {
-		super(domain, label, affectedFiles);
-	}
-
-	/**
-	 * To EMF proxy.
-	 *
-	 * @return
-	 */
-	public Command toEMFCommand() {
-		return new GMFtoEMFCommandWrapper(this);
-	}
-
-	/**
-	 * To GEF proxy.
-	 *
-	 * @return
-	 */
-	// @unused
-	public org.eclipse.gef.commands.Command toGEFCommand() {
-		return new ICommandProxy(this);
-	}
-
-	/**
-	 * Execute this command in the <EditingDomain>'s <CommandStack> as a
-	 * transaction.
-	 */
-	// @unused
-	public void executeInTransaction() {
-		if (getEditingDomain() != null) {
-			getEditingDomain().getCommandStack().execute(toEMFCommand());
-		}
-	}
-
-}
+/*******************************************************************************

+ * Copyright (c) 2008 Conselleria de Infraestructuras y Transporte,

+ * Generalitat de la Comunitat Valenciana .

+ * 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: Francisco Javier Cano Muñoz (Prodevelop) - initial API implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.common.commands;

+

+import java.util.List;

+

+import org.eclipse.emf.common.command.Command;

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

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

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

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+

+/**

+ * An <AbstractTransactionalCommand> that can give proxies for EMF and GEF.

+ *

+ * @author <a href="mailto:fjcano@prodevelop.es">Francisco Javier Cano Muñoz</a>

+ *

+ */

+public abstract class AbstractCommonTransactionalCommmand extends AbstractTransactionalCommand {

+

+	/**

+	 * Default constructor.

+	 *

+	 * @param domain

+	 * @param label

+	 * @param affectedFiles

+	 */

+	public AbstractCommonTransactionalCommmand(TransactionalEditingDomain domain, String label, List affectedFiles) {

+		super(domain, label, affectedFiles);

+	}

+

+	/**

+	 * To EMF proxy.

+	 *

+	 * @return

+	 */

+	public Command toEMFCommand() {

+		return new GMFtoEMFCommandWrapper(this);

+	}

+

+	/**

+	 * To GEF proxy.

+	 *

+	 * @return

+	 */

+	// @unused

+	public org.eclipse.gef.commands.Command toGEFCommand() {

+		return new ICommandProxy(this);

+	}

+

+	/**

+	 * Execute this command in the <EditingDomain>'s <CommandStack> as a

+	 * transaction.

+	 */

+	// @unused

+	public void executeInTransaction() {

+		if (getEditingDomain() != null) {

+			getEditingDomain().getCommandStack().execute(toEMFCommand());

+		}

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
index 5ae540b4a27..e723d778fd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ModelCreationCommandBase.java
@@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
 import org.eclipse.papyrus.uml.tools.model.UmlUtils;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommentShapeForAppliedStereotypeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommentShapeForAppliedStereotypeEditPolicy.java
index 0e742df6772..3a2a4b1003e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommentShapeForAppliedStereotypeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommentShapeForAppliedStereotypeEditPolicy.java
@@ -29,9 +29,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
 import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayConstant;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ListenerEventEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ListenerEventEditPolicy.java
index 758e1119629..80dd70e2bbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ListenerEventEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/ListenerEventEditPolicy.java
@@ -1,244 +1,244 @@
-/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos - Initial API and implementation
- *   Arthur Daussy (Atos) arthur.daussy@atos.net - Bug 249786: [General] drag'n'drop does not work for elements stored in nested classifier compartment
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.editpolicies;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-
-import com.google.common.collect.ImmutableSet;
-
-public abstract class ListenerEventEditPolicy extends AbstractEditPolicy implements IStructuralFeatureListener {
-
-	/** Adds <code>String.class</tt> adaptablity to return a factory hint. Copied from {@link CanonicalEditPolicy} */
-	protected static final class ElementListenerAdapter extends EObjectAdapter {
-
-		private String _hint;
-
-		/**
-		 * constructor
-		 *
-		 * @param element
-		 * @param hint
-		 */
-		public ElementListenerAdapter(EObject element, String hint) {
-			super(element);
-			_hint = hint;
-		}
-
-		/** Adds <code>String.class</tt> adaptablity. */
-		@Override
-		public Object getAdapter(Class adapter) {
-			if (adapter.equals(String.class)) {
-				return _hint;
-			}
-			return super.getAdapter(adapter);
-		}
-	}
-
-	public ListenerEventEditPolicy() {
-		super();
-	}
-
-	/**
-	 * This method tries to locate the position that the view will be
-	 * inserted into it's parent. The position is determined by the position
-	 * of the semantic element. If the semantic element is not found the view
-	 * will be appended to it's parent.
-	 *
-	 * @param semanticChild
-	 * @return position where the view should be inserted
-	 */
-	protected int getViewIndexFor(EObject semanticChild) {
-		// The default implementation returns APPEND
-		return ViewUtil.APPEND;
-	}
-
-	/**
-	 * Returns the default factory hint.
-	 *
-	 * @return <code>host().getView().getSemanticType()</code>
-	 */
-	protected String getDefaultFactoryHint() {
-		return ((View) host().getModel()).getType();
-	}
-
-
-	/**
-	 * Return a view descriptor.
-	 *
-	 * @param elementAdapter
-	 *            semantic element
-	 * @param viewKind
-	 *            type of view to create
-	 * @param hint
-	 *            factory hint
-	 * @param index
-	 *            index
-	 * @return a create <i>non-persisted</i> view descriptor
-	 */
-	protected CreateViewRequest.ViewDescriptor getViewDescriptor(IAdaptable elementAdapter, Class viewKind, String hint, int index) {
-		return new CreateViewRequest.ViewDescriptor(elementAdapter, viewKind, hint, index, false, host().getDiagramPreferencesHint());
-	}
-
-
-
-	/**
-	 * Gets the diagram event broker from the editing domain.
-	 *
-	 * @return the diagram event broker
-	 */
-	private DiagramEventBroker getDiagramEventBroker() {
-		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		if (theEditingDomain != null) {
-			return DiagramEventBroker.getInstance(theEditingDomain);
-		}
-		throw new IllegalStateException("EditPolicy unable to retrive the DiagramEventBroker");//
-	}
-
-	/**
-	 * Return the {@link IGraphicalEditPart} host (never null)
-	 *
-	 * @return
-	 */
-	protected IGraphicalEditPart host() {
-		EditPart host = getHost();
-		if (host instanceof IGraphicalEditPart) {
-			return ((IGraphicalEditPart) host);
-		}
-		throw new IllegalStateException("The host of this EditPolicy is not an instance of IGraphicalEditPart");//
-	}
-
-	/**
-	 *
-	 * @return {@link EObject} of the host of this edit Policy or null if error
-	 */
-	protected EObject getSemanticHost() {
-		IGraphicalEditPart host = host();
-		if (host != null) {
-			return host.resolveSemanticElement();
-		}
-		return null;
-	}
-
-	/**
-	 * Add the listeners corresponding to to the structural feature
-	 *
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()
-	 */
-	@Override
-	public void activate() {
-		for (EStructuralFeature feature : getEStructuralFeaturesToListen()) {
-			getDiagramEventBroker().addNotificationListener(getSemanticHost(), feature, this);
-		}
-		super.activate();
-	}
-
-	/**
-	 * Add the listeners corresponding to to the structural feature
-	 *
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()
-	 */
-	@Override
-	public void deactivate() {
-		for (EStructuralFeature feature : getEStructuralFeaturesToListen()) {
-			getDiagramEventBroker().removeNotificationListener(getSemanticHost(), feature, this);
-		}
-		super.deactivate();
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationPreCommitListener#transactionAboutToCommit(org.eclipse.emf.common.notify.Notification)
-	 *
-	 * @param notification
-	 * @return
-	 */
-	@Override
-	public org.eclipse.emf.common.command.Command transactionAboutToCommit(Notification notification) {
-		ICommand result = null;
-		if (getEStructuralFeaturesToListen().contains(notification.getFeature()) && handleNotificationType(notification.getEventType())) {
-			Object newObject = notification.getNewValue();
-			Object oldObject = notification.getOldValue();
-			Object feature = notification.getFeature();
-			int eventType = notification.getEventType();
-			Object notifier = notification.getNotifier();
-			if (isInstaceofOrNull(newObject, EObject.class) && isInstaceofOrNull(oldObject, EObject.class) && feature instanceof EStructuralFeature && isInstaceofOrNull(notifier, EObject.class)) {
-				result = getCommand((EObject) newObject, (EObject) oldObject, (EStructuralFeature) feature, eventType, (EObject) notifier);
-			} else {
-				result = getSpecialCommandCommand(notification);
-			}
-		}
-		return (result != null) ? new GMFtoEMFCommandWrapper(result) : null;
-	}
-
-	/**
-	 * Similar to instance but return true if the objet is null
-	 *
-	 * @param o
-	 * @param clazz
-	 * @return
-	 */
-	private boolean isInstaceofOrNull(Object o, Class clazz) {
-		return o == null || clazz.isInstance(o);
-	}
-
-	/**
-	 * This method could be override by extended class to handle specific notification
-	 *
-	 * @param notification
-	 * @return
-	 */
-	protected ICommand getSpecialCommandCommand(Notification notification) {
-		return null;
-	}
-
-	protected abstract ICommand getCommand(EObject newObject, EObject oldObject, EStructuralFeature feature, int eventType, EObject notifier);
-
-	/**
-	 * {@inheritDoc IStructuralFeatureListener}
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IStructuralFeatureListener#handleNotificationType(int)
-	 *
-	 * @param type
-	 * @return
-	 */
-	@Override
-	public abstract boolean handleNotificationType(int type);
-
-	/**
-	 * {@inheritDoc IStructuralFeatureListener}
-	 *
-	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IStructuralFeatureListener#getEStructuralFeaturesToListen()
-	 *
-	 * @param type
-	 * @return
-	 */
-	@Override
-	public abstract ImmutableSet<EStructuralFeature> getEStructuralFeaturesToListen();
-}
+/*****************************************************************************

+ * Copyright (c) 2011 Atos.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   Atos - Initial API and implementation

+ *   Arthur Daussy (Atos) arthur.daussy@atos.net - Bug 249786: [General] drag'n'drop does not work for elements stored in nested classifier compartment

+ *

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

+package org.eclipse.papyrus.uml.diagram.common.editpolicies;

+

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

+import org.eclipse.emf.common.notify.Notification;

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

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

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

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.editpolicies.AbstractEditPolicy;

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

+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

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

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

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

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

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

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+

+import com.google.common.collect.ImmutableSet;

+

+public abstract class ListenerEventEditPolicy extends AbstractEditPolicy implements IStructuralFeatureListener {

+

+	/** Adds <code>String.class</tt> adaptablity to return a factory hint. Copied from {@link CanonicalEditPolicy} */

+	protected static final class ElementListenerAdapter extends EObjectAdapter {

+

+		private String _hint;

+

+		/**

+		 * constructor

+		 *

+		 * @param element

+		 * @param hint

+		 */

+		public ElementListenerAdapter(EObject element, String hint) {

+			super(element);

+			_hint = hint;

+		}

+

+		/** Adds <code>String.class</tt> adaptablity. */

+		@Override

+		public Object getAdapter(Class adapter) {

+			if (adapter.equals(String.class)) {

+				return _hint;

+			}

+			return super.getAdapter(adapter);

+		}

+	}

+

+	public ListenerEventEditPolicy() {

+		super();

+	}

+

+	/**

+	 * This method tries to locate the position that the view will be

+	 * inserted into it's parent. The position is determined by the position

+	 * of the semantic element. If the semantic element is not found the view

+	 * will be appended to it's parent.

+	 *

+	 * @param semanticChild

+	 * @return position where the view should be inserted

+	 */

+	protected int getViewIndexFor(EObject semanticChild) {

+		// The default implementation returns APPEND

+		return ViewUtil.APPEND;

+	}

+

+	/**

+	 * Returns the default factory hint.

+	 *

+	 * @return <code>host().getView().getSemanticType()</code>

+	 */

+	protected String getDefaultFactoryHint() {

+		return ((View) host().getModel()).getType();

+	}

+

+

+	/**

+	 * Return a view descriptor.

+	 *

+	 * @param elementAdapter

+	 *            semantic element

+	 * @param viewKind

+	 *            type of view to create

+	 * @param hint

+	 *            factory hint

+	 * @param index

+	 *            index

+	 * @return a create <i>non-persisted</i> view descriptor

+	 */

+	protected CreateViewRequest.ViewDescriptor getViewDescriptor(IAdaptable elementAdapter, Class viewKind, String hint, int index) {

+		return new CreateViewRequest.ViewDescriptor(elementAdapter, viewKind, hint, index, false, host().getDiagramPreferencesHint());

+	}

+

+

+

+	/**

+	 * Gets the diagram event broker from the editing domain.

+	 *

+	 * @return the diagram event broker

+	 */

+	private DiagramEventBroker getDiagramEventBroker() {

+		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

+		if (theEditingDomain != null) {

+			return DiagramEventBroker.getInstance(theEditingDomain);

+		}

+		throw new IllegalStateException("EditPolicy unable to retrive the DiagramEventBroker");//

+	}

+

+	/**

+	 * Return the {@link IGraphicalEditPart} host (never null)

+	 *

+	 * @return

+	 */

+	protected IGraphicalEditPart host() {

+		EditPart host = getHost();

+		if (host instanceof IGraphicalEditPart) {

+			return ((IGraphicalEditPart) host);

+		}

+		throw new IllegalStateException("The host of this EditPolicy is not an instance of IGraphicalEditPart");//

+	}

+

+	/**

+	 *

+	 * @return {@link EObject} of the host of this edit Policy or null if error

+	 */

+	protected EObject getSemanticHost() {

+		IGraphicalEditPart host = host();

+		if (host != null) {

+			return host.resolveSemanticElement();

+		}

+		return null;

+	}

+

+	/**

+	 * Add the listeners corresponding to to the structural feature

+	 *

+	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()

+	 */

+	@Override

+	public void activate() {

+		for (EStructuralFeature feature : getEStructuralFeaturesToListen()) {

+			getDiagramEventBroker().addNotificationListener(getSemanticHost(), feature, this);

+		}

+		super.activate();

+	}

+

+	/**

+	 * Add the listeners corresponding to to the structural feature

+	 *

+	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()

+	 */

+	@Override

+	public void deactivate() {

+		for (EStructuralFeature feature : getEStructuralFeaturesToListen()) {

+			getDiagramEventBroker().removeNotificationListener(getSemanticHost(), feature, this);

+		}

+		super.deactivate();

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationPreCommitListener#transactionAboutToCommit(org.eclipse.emf.common.notify.Notification)

+	 *

+	 * @param notification

+	 * @return

+	 */

+	@Override

+	public org.eclipse.emf.common.command.Command transactionAboutToCommit(Notification notification) {

+		ICommand result = null;

+		if (getEStructuralFeaturesToListen().contains(notification.getFeature()) && handleNotificationType(notification.getEventType())) {

+			Object newObject = notification.getNewValue();

+			Object oldObject = notification.getOldValue();

+			Object feature = notification.getFeature();

+			int eventType = notification.getEventType();

+			Object notifier = notification.getNotifier();

+			if (isInstaceofOrNull(newObject, EObject.class) && isInstaceofOrNull(oldObject, EObject.class) && feature instanceof EStructuralFeature && isInstaceofOrNull(notifier, EObject.class)) {

+				result = getCommand((EObject) newObject, (EObject) oldObject, (EStructuralFeature) feature, eventType, (EObject) notifier);

+			} else {

+				result = getSpecialCommandCommand(notification);

+			}

+		}

+		return (result != null) ? new GMFtoEMFCommandWrapper(result) : null;

+	}

+

+	/**

+	 * Similar to instance but return true if the objet is null

+	 *

+	 * @param o

+	 * @param clazz

+	 * @return

+	 */

+	private boolean isInstaceofOrNull(Object o, Class clazz) {

+		return o == null || clazz.isInstance(o);

+	}

+

+	/**

+	 * This method could be override by extended class to handle specific notification

+	 *

+	 * @param notification

+	 * @return

+	 */

+	protected ICommand getSpecialCommandCommand(Notification notification) {

+		return null;

+	}

+

+	protected abstract ICommand getCommand(EObject newObject, EObject oldObject, EStructuralFeature feature, int eventType, EObject notifier);

+

+	/**

+	 * {@inheritDoc IStructuralFeatureListener}

+	 *

+	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IStructuralFeatureListener#handleNotificationType(int)

+	 *

+	 * @param type

+	 * @return

+	 */

+	@Override

+	public abstract boolean handleNotificationType(int type);

+

+	/**

+	 * {@inheritDoc IStructuralFeatureListener}

+	 *

+	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IStructuralFeatureListener#getEStructuralFeaturesToListen()

+	 *

+	 * @param type

+	 * @return

+	 */

+	@Override

+	public abstract ImmutableSet<EStructuralFeature> getEStructuralFeaturesToListen();

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
index 15049362040..8d2a6045fa5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
 import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/AbstractPapyrusModifcationTriggerListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/AbstractPapyrusModifcationTriggerListener.java
index 885af81d11c..987373465e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/AbstractPapyrusModifcationTriggerListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/AbstractPapyrusModifcationTriggerListener.java
@@ -1,135 +1,135 @@
-/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Atos - Initial API and implementation
- *   Arthur Daussy Bug 366026 - [ActivityDiagram] Refactoring in order to try respect Generation Gap Pattern
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.listeners;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TriggerListener;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-
-/**
- * Abstract method used to trigger model modification by listenning the ressource set
- *
- * @author adaussy
- *
- */
-public abstract class AbstractPapyrusModifcationTriggerListener extends TriggerListener {
-	@Override
-	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
-		if (notification != null) {
-			ICommand cc = getModificationCommand(notification);
-			if (cc != null) {
-				return new GMFtoEMFCommandWrapper(cc);
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public abstract NotificationFilter getFilter();
-
-	/**
-	 * Command which will react to the trigger
-	 *
-	 * @param notif
-	 * @return
-	 */
-	protected abstract ICommand getModificationCommand(Notification notif);
-
-	/**
-	 * Return the main edipart which correspond to the {@link EObject} passed in argument
-	 *
-	 * @param eObject
-	 * @param rootEditPart
-	 *            {@link IGraphicalEditPart} root from which the search will start
-	 * @return
-	 */
-	protected IGraphicalEditPart getChildByEObject(final EObject eObject, IGraphicalEditPart rootEditPart, boolean isEdge) {
-		return DiagramEditPartsUtil.getChildByEObject(eObject, rootEditPart, isEdge);
-	}
-
-
-	/**
-	 * Get the referencing views
-	 *
-	 * @param oldEObject
-	 * @param predicates
-	 *            Additionnal predecate use to speciy search
-	 * @return
-	 */
-	protected Iterable<View> getReferencingView(EObject oldEObject, Predicate<? super View>... predicates) {
-		ECrossReferenceAdapter eCrossReferencer = ECrossReferenceAdapter.getCrossReferenceAdapter(oldEObject);
-		Collection<Setting> settings = eCrossReferencer.getInverseReferences(oldEObject, false);
-		Predicate<Setting> predicate = new Predicate<Setting>() {
-
-			@Override
-			public boolean apply(Setting input) {
-				EObject from = input.getEObject();
-				/*
-				 * Is a view
-				 */
-				if (from instanceof View && NotationPackage.Literals.VIEW__ELEMENT.equals(input.getEStructuralFeature())) {
-					return true;
-				}
-				return false;
-			}
-		};
-
-		Iterable<Setting> referencingView = Iterables.filter(settings, predicate);
-		Iterable<View> views = Iterables.transform(referencingView, new Function<Setting, View>() {
-
-			@Override
-			public View apply(Setting from) {
-				return (View) from.getEObject();
-			}
-		});
-
-		return Iterables.filter(views, Predicates.and(predicates));
-	}
-
-	/**
-	 * Get the transactionnal editing domain from EObject
-	 *
-	 * @param o
-	 * @return
-	 */
-	protected TransactionalEditingDomain getEditingDomain(Object o) {
-		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(o);
-		if (editingDomain instanceof TransactionalEditingDomain) {
-			TransactionalEditingDomain transEditingDomain = (TransactionalEditingDomain) editingDomain;
-			return transEditingDomain;
-		}
-		throw new RuntimeException("Enable to retreive editing domin from object");
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2011 Atos.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *   Atos - Initial API and implementation

+ *   Arthur Daussy Bug 366026 - [ActivityDiagram] Refactoring in order to try respect Generation Gap Pattern

+ *

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

+package org.eclipse.papyrus.uml.diagram.common.listeners;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.notify.Notification;

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

+import org.eclipse.emf.ecore.EStructuralFeature.Setting;

+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.transaction.NotificationFilter;

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

+import org.eclipse.emf.transaction.TriggerListener;

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

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+

+import com.google.common.base.Function;

+import com.google.common.base.Predicate;

+import com.google.common.base.Predicates;

+import com.google.common.collect.Iterables;

+

+/**

+ * Abstract method used to trigger model modification by listenning the ressource set

+ *

+ * @author adaussy

+ *

+ */

+public abstract class AbstractPapyrusModifcationTriggerListener extends TriggerListener {

+	@Override

+	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {

+		if (notification != null) {

+			ICommand cc = getModificationCommand(notification);

+			if (cc != null) {

+				return new GMFtoEMFCommandWrapper(cc);

+			}

+		}

+		return null;

+	}

+

+	@Override

+	public abstract NotificationFilter getFilter();

+

+	/**

+	 * Command which will react to the trigger

+	 *

+	 * @param notif

+	 * @return

+	 */

+	protected abstract ICommand getModificationCommand(Notification notif);

+

+	/**

+	 * Return the main edipart which correspond to the {@link EObject} passed in argument

+	 *

+	 * @param eObject

+	 * @param rootEditPart

+	 *            {@link IGraphicalEditPart} root from which the search will start

+	 * @return

+	 */

+	protected IGraphicalEditPart getChildByEObject(final EObject eObject, IGraphicalEditPart rootEditPart, boolean isEdge) {

+		return DiagramEditPartsUtil.getChildByEObject(eObject, rootEditPart, isEdge);

+	}

+

+

+	/**

+	 * Get the referencing views

+	 *

+	 * @param oldEObject

+	 * @param predicates

+	 *            Additionnal predecate use to speciy search

+	 * @return

+	 */

+	protected Iterable<View> getReferencingView(EObject oldEObject, Predicate<? super View>... predicates) {

+		ECrossReferenceAdapter eCrossReferencer = ECrossReferenceAdapter.getCrossReferenceAdapter(oldEObject);

+		Collection<Setting> settings = eCrossReferencer.getInverseReferences(oldEObject, false);

+		Predicate<Setting> predicate = new Predicate<Setting>() {

+

+			@Override

+			public boolean apply(Setting input) {

+				EObject from = input.getEObject();

+				/*

+				 * Is a view

+				 */

+				if (from instanceof View && NotationPackage.Literals.VIEW__ELEMENT.equals(input.getEStructuralFeature())) {

+					return true;

+				}

+				return false;

+			}

+		};

+

+		Iterable<Setting> referencingView = Iterables.filter(settings, predicate);

+		Iterable<View> views = Iterables.transform(referencingView, new Function<Setting, View>() {

+

+			@Override

+			public View apply(Setting from) {

+				return (View) from.getEObject();

+			}

+		});

+

+		return Iterables.filter(views, Predicates.and(predicates));

+	}

+

+	/**

+	 * Get the transactionnal editing domain from EObject

+	 *

+	 * @param o

+	 * @return

+	 */

+	protected TransactionalEditingDomain getEditingDomain(Object o) {

+		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(o);

+		if (editingDomain instanceof TransactionalEditingDomain) {

+			TransactionalEditingDomain transEditingDomain = (TransactionalEditingDomain) editingDomain;

+			return transEditingDomain;

+		}

+		throw new RuntimeException("Enable to retreive editing domin from object");

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
index aa7bec1e2b5..259090b55e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
@@ -1,311 +1,310 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.common.providers;
-
-import java.awt.Toolkit;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.ImageSupportGlobalActionHandler;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.ui.properties.actions.PropertyPageViewAction;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
-import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * this class has in charge to launch command for cut copy paste (graphically)
- * it is also used to launch the copy into bmp like as writer software
- *
- */
-@SuppressWarnings("restriction")
-public class PapyrusDiagramGlobalActionHandler extends ImageSupportGlobalActionHandler {
-
-	@Override
-	public boolean canHandle(IGlobalActionContext cntxt) {
-		/* Check if the active part is a IDiagramWorkbenchPart */
-		IWorkbenchPart part = cntxt.getActivePart();
-		part = (IWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class);
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return false;
-		}
-
-		/* Check if the selection is a structured selection */
-		if (!(cntxt.getSelection() instanceof IStructuredSelection)) {
-			return false;
-		}
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.COPY)) {
-			return canCopy(cntxt);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			return canCut(cntxt);
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-			return canPaste(cntxt);
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean canPaste(IGlobalActionContext cntxt) {
-		/* Get the selected edit parts */
-		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();
-
-		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {
-			ICommand pastecommand = PasteCommandService.getInstance().getPasteViewCommand(((GraphicalEditPart) objectsArray[0]), Toolkit.getDefaultToolkit().getSystemClipboard(), ((GraphicalEditPart) objectsArray[0]).getEditingDomain().getClipboard());
-			return pastecommand.canExecute();
-		}
-
-		if (!AWTClipboardHelper.getInstance().isImageCopySupported()) {
-			return super.canPaste(cntxt);
-		}
-
-		/* Check if the clipboard has data for the drawing surface */
-		return AWTClipboardHelper.getInstance().hasCustomData();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler
-	 * #getCommand(org.eclipse.gmf.runtime.common.ui.services.action.
-	 * global.IGlobalActionContext)
-	 */
-	@Override
-	public ICommand getCommand(IGlobalActionContext cntxt) {
-		/* Check if the active part is a IDiagramWorkbenchPart */
-		IWorkbenchPart part = cntxt.getActivePart();
-		part = (IWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class);
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return null;
-		}
-
-		/* Get the model operation context */
-		IDiagramWorkbenchPart diagramPart = (IDiagramWorkbenchPart) part;
-
-		/* Create a command */
-		ICommand command = null;
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.DELETE)) {
-			CompoundCommand deleteCC = getDeleteCommand(diagramPart, cntxt);
-			/* Set the command */
-			if (deleteCC != null && deleteCC.canExecute()) {
-				command = new CommandProxy(deleteCC);
-			}
-		} else if (actionId.equals(GlobalActionId.COPY)) {
-			command = getCopyCommand(cntxt, diagramPart, false);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			command = getCutCommand(cntxt, diagramPart);
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-
-			/* Get the selected edit parts */
-			Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();
-
-			if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {
-
-				ICommand pastecommand = PasteCommandService.getInstance().getPasteViewCommand(((GraphicalEditPart) objectsArray[0]), Toolkit.getDefaultToolkit().getSystemClipboard(), ((GraphicalEditPart) objectsArray[0]).getEditingDomain().getClipboard());
-
-				if (pastecommand.canExecute()) {
-					((GraphicalEditPart) objectsArray[0]).getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pastecommand));
-					RootEditPart topEditPart = ((GraphicalEditPart) objectsArray[0]).getRoot();
-					if (topEditPart.getChildren().get(0) instanceof DiagramEditPart) {
-						CleanDiagramHelper.getInstance().run((DiagramEditPart) topEditPart.getChildren().get(0));
-					}
-
-				}
-				return null;
-			}
-
-		} else if (actionId.equals(GlobalActionId.SAVE)) {
-			part.getSite().getPage().saveEditor((IEditorPart) diagramPart, false);
-		} else if (actionId.equals(GlobalActionId.PROPERTIES)) {
-			new PropertyPageViewAction().run();
-		}
-
-		return command;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#getCopyCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext, org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart, boolean) this
-	 *      class also copy in the clipboard of the editing domain
-	 *      selected elements
-	 *
-	 */
-
-	@Override
-	protected ICommand getCopyCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart, boolean isUndoable) {
-		/* Get the selected edit parts */
-		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();
-		CompositeCommand compositeCommand = new CompositeCommand(GlobalActionId.COPY);
-		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {
-			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)
-			// cntxt.getSelection()).toList());
-			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((GraphicalEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));
-		}
-		if (objectsArray.length > 0 && objectsArray[0] instanceof ConnectionEditPart) {
-			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)
-			// cntxt.getSelection()).toList());
-			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((ConnectionEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));
-		}
-		compositeCommand.add(super.getCopyCommand(cntxt, diagramPart, isUndoable));
-		return compositeCommand;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#getCutCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext, org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart)
-	 *
-	 * @param cntxt
-	 * @param diagramPart
-	 * @return
-	 */
-
-	@Override
-	protected ICommand getCutCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart) {
-		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();
-		CompositeCommand compositeCommand = new CompositeCommand(GlobalActionId.CUT);
-		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {
-			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)
-			// cntxt.getSelection()).toList());
-			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((GraphicalEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));
-
-		}
-		if (objectsArray.length > 0 && objectsArray[0] instanceof ConnectionEditPart) {
-			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)
-			// cntxt.getSelection()).toList());
-			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((ConnectionEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));
-		}
-		ICommand cutCommand = super.getCutCommand(cntxt, diagramPart);
-		if (cutCommand != null) {
-			compositeCommand.add(cutCommand);
-		}
-		return compositeCommand;
-	}
-
-	/**
-	 * Returns appropriate delete command for this context.
-	 *
-	 * @param part
-	 *            the workbench part
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return CompoundCommand command
-	 */
-	private CompoundCommand getDeleteCommand(IDiagramWorkbenchPart part, IGlobalActionContext cntxt) {
-		/* Create the delete request */
-		GroupRequest deleteReq = new GroupRequest(RequestConstants.REQ_DELETE);
-
-		CompoundCommand deleteCC = new CompoundCommand(cntxt.getLabel());
-
-		TransactionalEditingDomain editingDomain = getEditingDomain(part);
-
-		if (editingDomain == null) {
-			return deleteCC;
-		}
-
-		CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(editingDomain, cntxt.getLabel());
-		/* Get the selected edit parts */
-		Object[] objects = ((IStructuredSelection) cntxt.getSelection()).toArray();
-		for (int i = 0; i < objects.length; i++) {
-			/* Get the next part */
-			EditPart editPart = (EditPart) objects[i];
-
-			/* Send the request to the edit part */
-			org.eclipse.gef.commands.Command command = editPart.getCommand(deleteReq);
-			if (command != null)
-			{
-				compositeCommand.compose(new CommandProxy(command));
-				// deleteCC.add(editPart.getCommand(deleteReq));
-			}
-		}
-		if (!compositeCommand.isEmpty()) {
-			deleteCC.add(new ICommandProxy(compositeCommand));
-		}
-
-		return deleteCC;
-	}
-
-	/**
-	 * Gets the transactional editing domain associated with the workbench <code>part</code>.
-	 *
-	 * @param part
-	 *            the diagram workbench part
-	 * @return the editing domain, or <code>null</code> if there is none.
-	 */
-	private TransactionalEditingDomain getEditingDomain(IDiagramWorkbenchPart part) {
-
-		TransactionalEditingDomain result = null;
-
-		IEditingDomainProvider provider = (IEditingDomainProvider) part.getAdapter(IEditingDomainProvider.class);
-
-		if (provider != null) {
-			EditingDomain domain = provider.getEditingDomain();
-
-			if (domain != null && domain instanceof TransactionalEditingDomain) {
-				result = (TransactionalEditingDomain) domain;
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * get the list of notation element from the a list of editpart
-	 *
-	 * @param editPartList
-	 *            the list of editpart
-	 * @return the list of notation element
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	protected List getNotation(List editPartList) {
-		ArrayList notationList = new ArrayList();
-		Iterator iterator = editPartList.iterator();
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			if (object instanceof EditPart) {
-				notationList.add(((EditPart) object).getModel());
-			}
-		}
-		return notationList;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2008 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

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

+ *

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

+package org.eclipse.papyrus.uml.diagram.common.providers;

+

+import java.awt.Toolkit;

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.emf.edit.command.CopyToClipboardCommand;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

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

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.RootEditPart;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.requests.GroupRequest;

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

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

+import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;

+import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext;

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

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

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;

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

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

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.AWTClipboardHelper;

+import org.eclipse.gmf.runtime.diagram.ui.render.internal.providers.ImageSupportGlobalActionHandler;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.ui.properties.actions.PropertyPageViewAction;

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

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;

+import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * this class has in charge to launch command for cut copy paste (graphically)

+ * it is also used to launch the copy into bmp like as writer software

+ *

+ */

+@SuppressWarnings("restriction")

+public class PapyrusDiagramGlobalActionHandler extends ImageSupportGlobalActionHandler {

+

+	@Override

+	public boolean canHandle(IGlobalActionContext cntxt) {

+		/* Check if the active part is a IDiagramWorkbenchPart */

+		IWorkbenchPart part = cntxt.getActivePart();

+		part = (IWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class);

+		if (!(part instanceof IDiagramWorkbenchPart)) {

+			return false;

+		}

+

+		/* Check if the selection is a structured selection */

+		if (!(cntxt.getSelection() instanceof IStructuredSelection)) {

+			return false;

+		}

+

+		/* Check the action id */

+		String actionId = cntxt.getActionId();

+		if (actionId.equals(GlobalActionId.COPY)) {

+			return canCopy(cntxt);

+		} else if (actionId.equals(GlobalActionId.CUT)) {

+			return canCut(cntxt);

+		} else if (actionId.equals(GlobalActionId.PASTE)) {

+			return canPaste(cntxt);

+		}

+		return false;

+	}

+

+	@Override

+	protected boolean canPaste(IGlobalActionContext cntxt) {

+		/* Get the selected edit parts */

+		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();

+

+		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {

+			ICommand pastecommand = PasteCommandService.getInstance().getPasteViewCommand(((GraphicalEditPart) objectsArray[0]), Toolkit.getDefaultToolkit().getSystemClipboard(), ((GraphicalEditPart) objectsArray[0]).getEditingDomain().getClipboard());

+			return pastecommand.canExecute();

+		}

+

+		if (!AWTClipboardHelper.getInstance().isImageCopySupported()) {

+			return super.canPaste(cntxt);

+		}

+

+		/* Check if the clipboard has data for the drawing surface */

+		return AWTClipboardHelper.getInstance().hasCustomData();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 *

+	 * @see

+	 * org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandler

+	 * #getCommand(org.eclipse.gmf.runtime.common.ui.services.action.

+	 * global.IGlobalActionContext)

+	 */

+	@Override

+	public ICommand getCommand(IGlobalActionContext cntxt) {

+		/* Check if the active part is a IDiagramWorkbenchPart */

+		IWorkbenchPart part = cntxt.getActivePart();

+		part = (IWorkbenchPart) part.getAdapter(IDiagramWorkbenchPart.class);

+		if (!(part instanceof IDiagramWorkbenchPart)) {

+			return null;

+		}

+

+		/* Get the model operation context */

+		IDiagramWorkbenchPart diagramPart = (IDiagramWorkbenchPart) part;

+

+		/* Create a command */

+		ICommand command = null;

+

+		/* Check the action id */

+		String actionId = cntxt.getActionId();

+		if (actionId.equals(GlobalActionId.DELETE)) {

+			CompoundCommand deleteCC = getDeleteCommand(diagramPart, cntxt);

+			/* Set the command */

+			if (deleteCC != null && deleteCC.canExecute()) {

+				command = new CommandProxy(deleteCC);

+			}

+		} else if (actionId.equals(GlobalActionId.COPY)) {

+			command = getCopyCommand(cntxt, diagramPart, false);

+		} else if (actionId.equals(GlobalActionId.CUT)) {

+			command = getCutCommand(cntxt, diagramPart);

+		} else if (actionId.equals(GlobalActionId.PASTE)) {

+

+			/* Get the selected edit parts */

+			Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();

+

+			if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {

+

+				ICommand pastecommand = PasteCommandService.getInstance().getPasteViewCommand(((GraphicalEditPart) objectsArray[0]), Toolkit.getDefaultToolkit().getSystemClipboard(), ((GraphicalEditPart) objectsArray[0]).getEditingDomain().getClipboard());

+

+				if (pastecommand.canExecute()) {

+					((GraphicalEditPart) objectsArray[0]).getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pastecommand));

+					RootEditPart topEditPart = ((GraphicalEditPart) objectsArray[0]).getRoot();

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

+						CleanDiagramHelper.getInstance().run((DiagramEditPart) topEditPart.getChildren().get(0));

+					}

+

+				}

+				return null;

+			}

+

+		} else if (actionId.equals(GlobalActionId.SAVE)) {

+			part.getSite().getPage().saveEditor((IEditorPart) diagramPart, false);

+		} else if (actionId.equals(GlobalActionId.PROPERTIES)) {

+			new PropertyPageViewAction().run();

+		}

+

+		return command;

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#getCopyCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext, org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart, boolean) this

+	 *      class also copy in the clipboard of the editing domain

+	 *      selected elements

+	 *

+	 */

+

+	@Override

+	protected ICommand getCopyCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart, boolean isUndoable) {

+		/* Get the selected edit parts */

+		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();

+		CompositeCommand compositeCommand = new CompositeCommand(GlobalActionId.COPY);

+		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {

+			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)

+			// cntxt.getSelection()).toList());

+			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((GraphicalEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));

+		}

+		if (objectsArray.length > 0 && objectsArray[0] instanceof ConnectionEditPart) {

+			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)

+			// cntxt.getSelection()).toList());

+			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((ConnectionEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));

+		}

+		compositeCommand.add(super.getCopyCommand(cntxt, diagramPart, isUndoable));

+		return compositeCommand;

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandler#getCutCommand(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext, org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart)

+	 *

+	 * @param cntxt

+	 * @param diagramPart

+	 * @return

+	 */

+

+	@Override

+	protected ICommand getCutCommand(IGlobalActionContext cntxt, IDiagramWorkbenchPart diagramPart) {

+		Object[] objectsArray = ((IStructuredSelection) cntxt.getSelection()).toArray();

+		CompositeCommand compositeCommand = new CompositeCommand(GlobalActionId.CUT);

+		if (objectsArray.length > 0 && objectsArray[0] instanceof GraphicalEditPart) {

+			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)

+			// cntxt.getSelection()).toList());

+			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((GraphicalEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));

+

+		}

+		if (objectsArray.length > 0 && objectsArray[0] instanceof ConnectionEditPart) {

+			// ((GraphicalEditPart)objectsArray[0]).getEditingDomain().setClipboard(((IStructuredSelection)

+			// cntxt.getSelection()).toList());

+			compositeCommand.add(new EMFtoGMFCommandWrapper(CopyToClipboardCommand.create(((ConnectionEditPart) objectsArray[0]).getEditingDomain(), getNotation(((IStructuredSelection) cntxt.getSelection()).toList()))));

+		}

+		ICommand cutCommand = super.getCutCommand(cntxt, diagramPart);

+		if (cutCommand != null) {

+			compositeCommand.add(cutCommand);

+		}

+		return compositeCommand;

+	}

+

+	/**

+	 * Returns appropriate delete command for this context.

+	 *

+	 * @param part

+	 *            the workbench part

+	 * @param cntxt

+	 *            the <code>IGlobalActionContext</code> holding the necessary

+	 *            information needed by this action handler

+	 * @return CompoundCommand command

+	 */

+	private CompoundCommand getDeleteCommand(IDiagramWorkbenchPart part, IGlobalActionContext cntxt) {

+		/* Create the delete request */

+		GroupRequest deleteReq = new GroupRequest(RequestConstants.REQ_DELETE);

+

+		CompoundCommand deleteCC = new CompoundCommand(cntxt.getLabel());

+

+		TransactionalEditingDomain editingDomain = getEditingDomain(part);

+

+		if (editingDomain == null) {

+			return deleteCC;

+		}

+

+		CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(editingDomain, cntxt.getLabel());

+		/* Get the selected edit parts */

+		Object[] objects = ((IStructuredSelection) cntxt.getSelection()).toArray();

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

+			/* Get the next part */

+			EditPart editPart = (EditPart) objects[i];

+

+			/* Send the request to the edit part */

+			org.eclipse.gef.commands.Command command = editPart.getCommand(deleteReq);

+			if (command != null) {

+				compositeCommand.compose(new CommandProxy(command));

+				// deleteCC.add(editPart.getCommand(deleteReq));

+			}

+		}

+		if (!compositeCommand.isEmpty()) {

+			deleteCC.add(new ICommandProxy(compositeCommand));

+		}

+

+		return deleteCC;

+	}

+

+	/**

+	 * Gets the transactional editing domain associated with the workbench <code>part</code>.

+	 *

+	 * @param part

+	 *            the diagram workbench part

+	 * @return the editing domain, or <code>null</code> if there is none.

+	 */

+	private TransactionalEditingDomain getEditingDomain(IDiagramWorkbenchPart part) {

+

+		TransactionalEditingDomain result = null;

+

+		IEditingDomainProvider provider = (IEditingDomainProvider) part.getAdapter(IEditingDomainProvider.class);

+

+		if (provider != null) {

+			EditingDomain domain = provider.getEditingDomain();

+

+			if (domain != null && domain instanceof TransactionalEditingDomain) {

+				result = (TransactionalEditingDomain) domain;

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * get the list of notation element from the a list of editpart

+	 *

+	 * @param editPartList

+	 *            the list of editpart

+	 * @return the list of notation element

+	 */

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

+	protected List getNotation(List editPartList) {

+		ArrayList notationList = new ArrayList();

+		Iterator iterator = editPartList.iterator();

+		while (iterator.hasNext()) {

+			Object object = iterator.next();

+			if (object instanceof EditPart) {

+				notationList.add(((EditPart) object).getModel());

+			}

+		}

+		return notationList;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index c3af97d77fa..26f714dbd47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -26,13 +26,13 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
@@ -43,7 +43,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
index fec6205b129..2afb933a0e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.communication</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.communication</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
index a3eeb36cbc9..775524d830d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index 296b69892c5..1d59348057a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
index 6080c8f76ef..d90ff35b111 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
index 2ec5d1980a0..ab84ffb7da5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
index bb54a9b1570..92478ae0555 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
index 9d864595424..0a013a7e27f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
index 38745258de6..9b168c7c1da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
@@ -21,7 +21,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
index f64933601b4..d1e050b8a94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index 6190997e01e..b9140f43113 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -14,18 +14,18 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
index 4d48a3c86be..957e653a1ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/handler/ChangeShapeHandler.java
@@ -1,131 +1,131 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.component.custom.handler;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.edit.command.DeleteCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.component.custom.command.DeferredSetViewCommand;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is an abstract class in charge to transform a editpart into another editpart
- *
- */
-public abstract class ChangeShapeHandler extends AbstractHandler {
-
-	protected TransactionalEditingDomain transactionalEditingDomain = null;
-
-	protected org.eclipse.uml2.uml.Element selectedElement = null;
-	protected String newType;
-
-	/**
-	 *
-	 * Constructor.
-	 *
-	 */
-	public ChangeShapeHandler() {
-		super();
-	}
-
-	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);
-
-	/**
-	 *
-	 * @return null or the selected editPart
-	 */
-	protected GraphicalEditPart getSelectedGraphicalEditpart() {
-		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (activeWorkbenchWindow != null) {
-			ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();
-			ISelection selection = selectionService.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				Object selectedobject = ((IStructuredSelection) selection).getFirstElement();
-				if (selectedobject instanceof GraphicalEditPart) {
-					return (GraphicalEditPart) selectedobject;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();
-		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();
-		try {
-			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);
-		} catch (Exception e) {
-			System.err.println("impossible to get the Transactional Editing Domain " + e);
-		}
-		try {
-			editPart.getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					Display.getCurrent().asyncExec(new Runnable() {
-
-						@Override
-						public void run() {
-							// get Links
-							View view = (View) (editPart.getModel());
-							TransactionalEditingDomain domain = editPart.getEditingDomain();
-							@SuppressWarnings("unchecked")
-							ArrayList<Edge> targetEdge = new ArrayList<Edge>(view.getTargetEdges());
-							@SuppressWarnings("unchecked")
-							ArrayList<Edge> sourceEdge = new ArrayList<Edge>(view.getSourceEdges());
-
-							// create new Shape
-							AbstractTransactionalCommand createCommand = getChangeShapeCommand(editPart);
-							org.eclipse.emf.common.command.Command deleteCommand = DeleteCommand.create(editPart.getEditingDomain(), view);
-							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape");
-							compoundCommand.append(new GMFtoEMFCommandWrapper(createCommand));
-
-							// remove old Shape
-							compoundCommand.append(deleteCommand);
-
-							// Add links
-							DeferredSetViewCommand deferredSetCommand = new DeferredSetViewCommand(domain, (SemanticAdapter) createCommand.getCommandResult().getReturnValue(), NotationPackage.eINSTANCE.getView_SourceEdges(), sourceEdge);
-							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
-							deferredSetCommand = new DeferredSetViewCommand(domain, (SemanticAdapter) createCommand.getCommandResult().getReturnValue(), NotationPackage.eINSTANCE.getView_TargetEdges(), targetEdge);
-							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));
-
-							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);
-						}
-					});
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.component.custom.handler;

+

+import java.util.ArrayList;

+

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

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

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

+import org.eclipse.emf.edit.command.DeleteCommand;

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

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

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

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

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

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

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.component.custom.command.DeferredSetViewCommand;

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

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * This class is an abstract class in charge to transform a editpart into another editpart

+ *

+ */

+public abstract class ChangeShapeHandler extends AbstractHandler {

+

+	protected TransactionalEditingDomain transactionalEditingDomain = null;

+

+	protected org.eclipse.uml2.uml.Element selectedElement = null;

+	protected String newType;

+

+	/**

+	 *

+	 * Constructor.

+	 *

+	 */

+	public ChangeShapeHandler() {

+		super();

+	}

+

+	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);

+

+	/**

+	 *

+	 * @return null or the selected editPart

+	 */

+	protected GraphicalEditPart getSelectedGraphicalEditpart() {

+		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

+		if (activeWorkbenchWindow != null) {

+			ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();

+			ISelection selection = selectionService.getSelection();

+			if (selection instanceof IStructuredSelection) {

+				Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

+				if (selectedobject instanceof GraphicalEditPart) {

+					return (GraphicalEditPart) selectedobject;

+				}

+			}

+		}

+		return null;

+	}

+

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();

+		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();

+		try {

+			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);

+		} catch (Exception e) {

+			System.err.println("impossible to get the Transactional Editing Domain " + e);

+		}

+		try {

+			editPart.getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					Display.getCurrent().asyncExec(new Runnable() {

+

+						@Override

+						public void run() {

+							// get Links

+							View view = (View) (editPart.getModel());

+							TransactionalEditingDomain domain = editPart.getEditingDomain();

+							@SuppressWarnings("unchecked")

+							ArrayList<Edge> targetEdge = new ArrayList<Edge>(view.getTargetEdges());

+							@SuppressWarnings("unchecked")

+							ArrayList<Edge> sourceEdge = new ArrayList<Edge>(view.getSourceEdges());

+

+							// create new Shape

+							AbstractTransactionalCommand createCommand = getChangeShapeCommand(editPart);

+							org.eclipse.emf.common.command.Command deleteCommand = DeleteCommand.create(editPart.getEditingDomain(), view);

+							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape");

+							compoundCommand.append(new GMFtoEMFCommandWrapper(createCommand));

+

+							// remove old Shape

+							compoundCommand.append(deleteCommand);

+

+							// Add links

+							DeferredSetViewCommand deferredSetCommand = new DeferredSetViewCommand(domain, (SemanticAdapter) createCommand.getCommandResult().getReturnValue(), NotationPackage.eINSTANCE.getView_SourceEdges(), sourceEdge);

+							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));

+							deferredSetCommand = new DeferredSetViewCommand(domain, (SemanticAdapter) createCommand.getCommandResult().getReturnValue(), NotationPackage.eINSTANCE.getView_TargetEdges(), targetEdge);

+							compoundCommand.append(new GMFtoEMFCommandWrapper(deferredSetCommand));

+

+							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);

+						}

+					});

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
index 01464178048..e873c0ec768 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

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

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

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 6d4ab8a2db4..08d1957baed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -35,18 +35,18 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorPortEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorPortEditPolicy.java
index 08caedb70b4..82d52e535e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorPortEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorPortEditPolicy.java
@@ -35,7 +35,7 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
 import org.eclipse.papyrus.uml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.command.CreateBehaviorPortCommand;
 import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorSymbolEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorSymbolEditPolicy.java
index abc887cd2ea..83eaebe77f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorSymbolEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/BehaviorSymbolEditPolicy.java
@@ -1,180 +1,180 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 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:
- *		Patrick Tessier (CEA LIST) - Initial API and implementation
- *      Christian W. Damus (CEA) - bug 323802
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
-import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortLinkEditPart;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * This editpolicy listen the notation node of the PortEditpart, when it is removed the notation representation of the symbol is removed.
- *
- */
-
-public class BehaviorSymbolEditPolicy extends GraphicalEditPolicy implements NotificationListener, IPapyrusListener {
-	public static String BEHAVIOR_SYMBOL = "BehaviorSymbolEditPolicy";
-
-	@Override
-	public void notifyChanged(Notification notification) {
-		View behaviorSymbol = getView();
-		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(behaviorSymbol);
-		if (getUMLElement() == null) {
-			executeBehaviorSymbolDeletion(domain, behaviorSymbol);
-		}
-		final int eventType = notification.getEventType();
-
-		if (eventType == Notification.REMOVE || (eventType == Notification.SET && notification.getFeature().equals(NotationPackage.eINSTANCE.getView_Visible()))) {
-
-			if (getView() != null) {
-
-				if (getPortNode() == null) {
-					executeBehaviorSymbolDeletion(domain, behaviorSymbol);
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * return the Port that represents the port
-	 *
-	 * @return may be null if nothing is founded
-	 */
-	protected Node getPortNode() {
-		View SemanticView = (View) getHost().getModel();
-
-		Edge behaviorPortLink = null;
-		@SuppressWarnings("unchecked")
-		Iterator<Edge> edgeIterator = SemanticView.getTargetEdges().iterator();
-		while (edgeIterator.hasNext()) {
-			Edge edge = edgeIterator.next();
-			if (edge.getType().equals("" + BehaviorPortLinkEditPart.VISUAL_ID)) {
-				behaviorPortLink = edge;
-			}
-
-		}
-		if (behaviorPortLink == null) {
-			return null;
-		}
-		return (Node) behaviorPortLink.getSource();
-
-	}
-
-	/**
-	 * Returns the uml element controlled by the host edit part
-	 *
-	 * @return the uml element controlled by the host edit part
-	 */
-	protected Element getUMLElement() {
-		if ((Element) getView().getElement() != null) {
-			return (Element) getView().getElement();
-		}
-		return null;
-	}
-
-	@Override
-	public void activate() {
-		// retrieve the view and the element managed by the edit part
-		View view = getView();
-		if (view == null) {
-			return;
-		}
-		if (getPortNode() != null) {
-			getDiagramEventBroker().addNotificationListener(getPortNode(), this);
-		}
-		// adds a listener on the view and the element controlled by the
-		// editpart
-		getDiagramEventBroker().addNotificationListener(view, this);
-
-	}
-
-	/**
-	 *
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void deactivate() {
-		// retrieve the view and the element managed by the edit part
-		View view = getView();
-		if (view == null) {
-			return;
-		}
-		if (getPortNode() != null) {
-			getDiagramEventBroker().removeNotificationListener(getPortNode(), this);
-		}
-		getDiagramEventBroker().removeNotificationListener(view, this);
-	}
-
-	/**
-	 * Gets the diagram event broker from the editing domain.
-	 *
-	 * @return the diagram event broker
-	 */
-	protected DiagramEventBroker getDiagramEventBroker() {
-		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		if (theEditingDomain != null) {
-			return DiagramEventBroker.getInstance(theEditingDomain);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the view controlled by the host edit part
-	 *
-	 * @return the view controlled by the host edit part
-	 */
-	protected View getView() {
-		return (View) getHost().getModel();
-	}
-
-	protected void executeBehaviorSymbolDeletion(final TransactionalEditingDomain domain, final View commentNode) {
-		try {
-			if (domain != null) {
-				domain.runExclusive(new Runnable() {
-
-					@Override
-					public void run() {
-						if ((commentNode != null) && (TransactionUtil.getEditingDomain(commentNode) != null)) {
-							DeleteCommand command = new DeleteCommand(commentNode);
-							try {
-								GMFUnsafe.write(domain, command);
-							} catch (Exception e) {
-								Activator.log.error(e);
-							}
-						}
-					}
-				});
-			}
-		} catch (Exception e) {
-			Activator.log.error(e);
-		}
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2013, 2014 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:

+ *		Patrick Tessier (CEA LIST) - Initial API and implementation

+ *      Christian W. Damus (CEA) - bug 323802

+ *

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

+package org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.common.notify.Notification;

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

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.editpolicies.GraphicalEditPolicy;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;

+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.BehaviorPortLinkEditPart;

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

+

+/**

+ * This editpolicy listen the notation node of the PortEditpart, when it is removed the notation representation of the symbol is removed.

+ *

+ */

+

+public class BehaviorSymbolEditPolicy extends GraphicalEditPolicy implements NotificationListener, IPapyrusListener {

+	public static String BEHAVIOR_SYMBOL = "BehaviorSymbolEditPolicy";

+

+	@Override

+	public void notifyChanged(Notification notification) {

+		View behaviorSymbol = getView();

+		final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(behaviorSymbol);

+		if (getUMLElement() == null) {

+			executeBehaviorSymbolDeletion(domain, behaviorSymbol);

+		}

+		final int eventType = notification.getEventType();

+

+		if (eventType == Notification.REMOVE || (eventType == Notification.SET && notification.getFeature().equals(NotationPackage.eINSTANCE.getView_Visible()))) {

+

+			if (getView() != null) {

+

+				if (getPortNode() == null) {

+					executeBehaviorSymbolDeletion(domain, behaviorSymbol);

+				}

+

+			}

+		}

+	}

+

+	/**

+	 * return the Port that represents the port

+	 *

+	 * @return may be null if nothing is founded

+	 */

+	protected Node getPortNode() {

+		View SemanticView = (View) getHost().getModel();

+

+		Edge behaviorPortLink = null;

+		@SuppressWarnings("unchecked")

+		Iterator<Edge> edgeIterator = SemanticView.getTargetEdges().iterator();

+		while (edgeIterator.hasNext()) {

+			Edge edge = edgeIterator.next();

+			if (edge.getType().equals("" + BehaviorPortLinkEditPart.VISUAL_ID)) {

+				behaviorPortLink = edge;

+			}

+

+		}

+		if (behaviorPortLink == null) {

+			return null;

+		}

+		return (Node) behaviorPortLink.getSource();

+

+	}

+

+	/**

+	 * Returns the uml element controlled by the host edit part

+	 *

+	 * @return the uml element controlled by the host edit part

+	 */

+	protected Element getUMLElement() {

+		if ((Element) getView().getElement() != null) {

+			return (Element) getView().getElement();

+		}

+		return null;

+	}

+

+	@Override

+	public void activate() {

+		// retrieve the view and the element managed by the edit part

+		View view = getView();

+		if (view == null) {

+			return;

+		}

+		if (getPortNode() != null) {

+			getDiagramEventBroker().addNotificationListener(getPortNode(), this);

+		}

+		// adds a listener on the view and the element controlled by the

+		// editpart

+		getDiagramEventBroker().addNotificationListener(view, this);

+

+	}

+

+	/**

+	 *

+	 * {@inheritDoc}

+	 */

+	@Override

+	public void deactivate() {

+		// retrieve the view and the element managed by the edit part

+		View view = getView();

+		if (view == null) {

+			return;

+		}

+		if (getPortNode() != null) {

+			getDiagramEventBroker().removeNotificationListener(getPortNode(), this);

+		}

+		getDiagramEventBroker().removeNotificationListener(view, this);

+	}

+

+	/**

+	 * Gets the diagram event broker from the editing domain.

+	 *

+	 * @return the diagram event broker

+	 */

+	protected DiagramEventBroker getDiagramEventBroker() {

+		TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();

+		if (theEditingDomain != null) {

+			return DiagramEventBroker.getInstance(theEditingDomain);

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the view controlled by the host edit part

+	 *

+	 * @return the view controlled by the host edit part

+	 */

+	protected View getView() {

+		return (View) getHost().getModel();

+	}

+

+	protected void executeBehaviorSymbolDeletion(final TransactionalEditingDomain domain, final View commentNode) {

+		try {

+			if (domain != null) {

+				domain.runExclusive(new Runnable() {

+

+					@Override

+					public void run() {

+						if ((commentNode != null) && (TransactionUtil.getEditingDomain(commentNode) != null)) {

+							DeleteCommand command = new DeleteCommand(commentNode);

+							try {

+								GMFUnsafe.write(domain, command);

+							} catch (Exception e) {

+								Activator.log.error(e);

+							}

+						}

+					}

+				});

+			}

+		} catch (Exception e) {

+			Activator.log.error(e);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
index b3b3e8b6e40..be2f7299f4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.composite</artifactId>
-	<version>2.0.100-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.composite</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
index 489c1c8107e..b1e1fc0386b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css.palette/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)"
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index 75742053772..d914abb739e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: UML-Specific CSS concepts
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
index 0d23fbdb6a6..0af58e6286b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.css</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.css</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index b0a7016e2ad..4dd079d2eb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -26,14 +26,14 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
index 02b548acab7..0692009eebd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.deployment</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.deployment</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index a3a18065d67..3d81698e8bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Export-Package: org.eclipse.papyrus.uml.diagram.dnd,
  org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.command,
  org.eclipse.papyrus.uml.diagram.dnd.strategy.instancespecification.ui
 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
index 6fdf057c8ce..6bb40382109 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.emftree
 Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index a7ed53fbebf..d0904e72257 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -14,20 +14,20 @@ Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview,
  org.eclipse.papyrus.uml.diagram.interactionoverview.provider,
  org.eclipse.papyrus.uml.diagram.interactionoverview.utils
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
index 26c1048e175..fde0daf19ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java
index 97a4317e6e5..2f2b2a541ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/Activator.java
@@ -1,117 +1,113 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InteractionOverviewDiagramPreferenceInitializer;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementInitializers;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/** The activator class controls the plug-in life cycle */
-public class Activator extends AbstractUIPlugin {
-
-	/** The plug-in ID */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.interactionoverview";
-
-	/** The plug-in shared instance */
-	private static Activator plugin;
-
-	/** The logging helper */
-	public static LogHelper log;
-
-	/** The plug-in Preference store */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);
-
-	/** Default constructor */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		// register the login helper
-		log = new LogHelper(plugin);
-
-		// register the preference store
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-
-		// Preferences initialization
-		final InteractionOverviewDiagramPreferenceInitializer diagramPreferenceInitializer = new InteractionOverviewDiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void stop(final BundleContext context) throws Exception {
-		log = null;
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getInstance() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in
-	 * relative path.
-	 *
-	 * @generated
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(final String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
-	 *
-	 * @return Shared Preference Store.
-	 */
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		final IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-
-	private ElementInitializers initializers;
-
-	public ElementInitializers getElementInitializers() {
-		return initializers;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

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

+package org.eclipse.papyrus.uml.diagram.interactionoverview;

+

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementInitializers;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/** The activator class controls the plug-in life cycle */

+public class Activator extends AbstractUIPlugin {

+

+	/** The plug-in ID */

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.interactionoverview";

+

+	/** The plug-in shared instance */

+	private static Activator plugin;

+

+	/** The logging helper */

+	public static LogHelper log;

+

+	/** The plug-in Preference store */

+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(PLUGIN_ID);

+

+	/** Default constructor */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 *

+	 * @see

+	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

+	 * )

+	 */

+	@Override

+	public void start(final BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+

+		// register the login helper

+		log = new LogHelper(plugin);

+

+		// register the preference store

+		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());

+

+	}

+

+	/*

+	 * (non-Javadoc)

+	 *

+	 * @see

+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

+	 * )

+	 */

+	@Override

+	public void stop(final BundleContext context) throws Exception {

+		log = null;

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getInstance() {

+		return plugin;

+	}

+

+	/**

+	 * Returns an image descriptor for the image file at the given plug-in

+	 * relative path.

+	 *

+	 * @generated

+	 * @param path

+	 *            the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getBundledImageDescriptor(final String path) {

+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()

+	 *

+	 * @return Shared Preference Store.

+	 */

+	@Override

+	public IPreferenceStore getPreferenceStore() {

+		final IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();

+		return store;

+	}

+

+	private ElementInitializers initializers;

+

+	public ElementInitializers getElementInitializers() {

+		return initializers;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java
deleted file mode 100644
index f362bfe590f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityFinalNodePreferencePage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ActivityFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ActivityFinalNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ActivityFinalNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ActivityFinalNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java
deleted file mode 100644
index 39c1ac63ae4..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ActivityPreferencePage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ActivityPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Activity"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("ActivityFigureParameterCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("ActivityFigurePreconditionCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("ActivityFigurePostCondtionCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentDefaultVisibilityMap.put("ActivityFigureContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("ActivityFigureParameterCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("ActivityFigurePreconditionCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("ActivityFigurePostCondtionCompartment", Boolean.TRUE); //$NON-NLS-1$
-		compartmentTitleDefaultVisibilityMap.put("ActivityFigureContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ActivityPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Activity"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 857);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 757);
-		// Initialize default visibility for compartments in preference page.
-		for (final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference
-		// page.
-		for (final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (final String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java
deleted file mode 100644
index b6e1d848c2e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CallBehaviorActionPreferencePage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class CallBehaviorActionPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CallBehaviorAction"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public CallBehaviorActionPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CallBehaviorAction"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java
deleted file mode 100644
index b92188a85a8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentAnnotatedElementPreferencePage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class CommentAnnotatedElementPreferencePage extends InteractionOverviewDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public CommentAnnotatedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_CommentAnnotatedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java
deleted file mode 100644
index 05dde5dcb8b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/CommentPreferencePage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class CommentPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Comment"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public CommentPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Comment"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java
deleted file mode 100644
index 9c2ff144e25..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConditionalNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ConditionalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConditionalNode"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ConditionalNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConditionalNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference
-		// page.
-		for (final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (final String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java
deleted file mode 100644
index 2bc3f097a51..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ConstraintPreferencePage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ConstraintPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public ConstraintPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java
deleted file mode 100644
index 684a468dd0e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ControlFlowPreferencePage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ControlFlowPreferencePage extends InteractionOverviewDiagramLinkPreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ControlFlow"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("Weight", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("Guard", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ControlFlowPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ControlFlow"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java
deleted file mode 100644
index 00c1a354da7..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/DecisionNodePreferencePage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class DecisionNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_DecisionNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public DecisionNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_DecisionNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java
deleted file mode 100644
index dbd392e8ee3..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/FlowFinalNodePreferencePage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class FlowFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_FlowFinalNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public FlowFinalNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_FlowFinalNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java
deleted file mode 100644
index 91284dae2c9..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ForkNodePreferencePage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ForkNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ForkNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public ForkNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ForkNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 10);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 40);
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java
deleted file mode 100644
index da16ca83c5f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InitialNodePreferencePage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class InitialNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_InitialNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public InitialNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_InitialNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java
deleted file mode 100644
index aa5073b8c3e..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramLinkPreferencePage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
-import org.eclipse.swt.widgets.Composite;
-
-public class InteractionOverviewDiagramLinkPreferencePage extends AbstractPapyrusLinkPreferencePage {
-
-	/** The list of label names for this link */
-	protected List<String> labelsList;
-
-	/** Constructor */
-	public InteractionOverviewDiagramLinkPreferencePage() {
-		labelsList = new ArrayList<String>();
-		initializeLabelsList();
-		Collections.unmodifiableList(labelsList);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createPageContents(final Composite parent) {
-		super.createPageContents(parent);
-
-		// Add label visibility group
-		if (!labelsList.isEmpty()) {
-			final OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
-			addAbstractGroup(compartmentGroup);
-		}
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/** Initialize the list containing names of labels. */
-	protected void initializeLabelsList() {
-		// Implemented by subclasses.
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected final TreeMap<String, String> getLabelRole() {
-		return new TreeMap<String, String>();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java
deleted file mode 100644
index 81f66192a49..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramNodePreferencePage.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
-import org.eclipse.swt.widgets.Composite;
-
-public class InteractionOverviewDiagramNodePreferencePage extends AbstractPapyrusNodePreferencePage {
-
-	/** The list owning the names of compartments */
-	protected List<String> compartmentNamesList;
-
-	/** The list owning the names of compartment that have a title */
-	protected List<String> compartmentTitlesList;
-
-	/** The list of label names for this node */
-	protected List<String> labelsList;
-
-	/** Constructor */
-	public InteractionOverviewDiagramNodePreferencePage() {
-		this.labelsList = new ArrayList<String>();
-		this.compartmentNamesList = new ArrayList<String>();
-		this.compartmentTitlesList = new ArrayList<String>();
-
-		initializeLabelsList();
-		initializeCompartmentNamesList();
-		initializeCompartmentTitlesList();
-
-		Collections.unmodifiableList(labelsList);
-		Collections.unmodifiableList(compartmentNamesList);
-		Collections.unmodifiableList(compartmentTitlesList);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void createPageContents(final Composite parent) {
-		super.createPageContents(parent);
-
-		// Add compartments visibility group
-		if (!compartmentNamesList.isEmpty()) {
-			final OrderedCompartmentGroup compartmentGroup = new OrderedCompartmentGroup(parent, getPreferenceKey(), this, compartmentNamesList, compartmentTitlesList, getPreferenceStore());
-			addAbstractGroup(compartmentGroup);
-		}
-
-		// Add label visibility group
-		if (!labelsList.isEmpty()) {
-			final OrderedLabelGroup compartmentGroup = new OrderedLabelGroup(parent, getPreferenceKey(), this, labelsList);
-			addAbstractGroup(compartmentGroup);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getBundleId() {
-		return Activator.PLUGIN_ID;
-	}
-
-	/** Initialize the list containing names of labels. */
-	protected void initializeLabelsList() {
-		// Implemented by subclasses.
-	}
-
-	/** Initialize the list containing the names of compartments. */
-	protected void initializeCompartmentNamesList() {
-		// Implemented by subclasses.
-	}
-
-	/**
-	 * Initialize the list containing the names of compartment that have titles.
-	 */
-	protected void initializeCompartmentTitlesList() {
-		// Implemented by subclasses.
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected final TreeMap<String, String> getLabelRole() {
-		return new TreeMap<String, String>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected final TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
-		return new TreeMap<String, Boolean>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected final void initializeCompartmentsList() {
-		compartmentsList = Collections.emptyList();
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java
deleted file mode 100644
index feec474d7be..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramPreferenceInitializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
-
-public class InteractionOverviewDiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	protected IPreferenceStore getPreferenceStore() {
-		return Activator.getInstance().getPreferenceStore();
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		final IPreferenceStore store = getPreferenceStore();
-
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage.initDefaults(store);
-		org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage.initDefaults(store);
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java
deleted file mode 100644
index afac87bb287..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/JoinNodePreferencePage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class JoinNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_JoinNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("undefined_role", Boolean.TRUE); //$NON-NLS-1$
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public JoinNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_JoinNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 10);
-		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 40);
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java
deleted file mode 100644
index 65aa7d2e5a6..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/LoopNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class LoopNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_LoopNode"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public LoopNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_LoopNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference
-		// page.
-		for (final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (final String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java
deleted file mode 100644
index cc1ddf10342..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/MergeNodePreferencePage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class MergeNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_MergeNode"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public MergeNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_MergeNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java
deleted file mode 100644
index ebfd015b802..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/NamedElementPreferencePage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class NamedElementPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ShapeNamedElement"; //$NON-NLS-1$
-
-	/** The labels default visibility for preferences */
-	public static final Map<String, Boolean> labelDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-
-		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(labelDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public NamedElementPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ShapeNamedElement"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for labels in preference page.
-		for (final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
-			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeLabelsList() {
-		for (final String name : labelDefaultVisibilityMap.keySet()) {
-			this.labelsList.add(name);
-		}
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java
deleted file mode 100644
index 85b53262c5b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/ParameterPreferencePage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class ParameterPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Parameter"; //$NON-NLS-1$
-
-	/** Default constructor */
-	public ParameterPreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Parameter"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java
deleted file mode 100644
index 7b3442959af..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/SequenceNodePreferencePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
-
-public class SequenceNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
-
-	/** Constant key to access preferences */
-	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_SequenceNode"; //$NON-NLS-1$
-
-	/** The compartments default visibility for preferences */
-	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
-
-	/** The compartment titles default visibility for preferences */
-	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
-
-	/** Static attribute initialization */
-	static {
-		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("StructuredActivityNodeContentCompartment", Boolean.TRUE); //$NON-NLS-1$
-
-		// Start of user code custom static initializations
-		// End of user code
-
-		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
-		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
-	}
-
-	/** Default constructor */
-	public SequenceNodePreferencePage() {
-		super();
-		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_SequenceNode"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Initialize defaults using a specified {@link IPreferenceStore}
-	 *
-	 * @param store
-	 *            the preference store.
-	 */
-	public static void initDefaults(final IPreferenceStore store) {
-		// Start of user code custom default initializations
-		// End of user code
-
-		// Initialize default visibility for compartments in preference page.
-		for (final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
-			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
-		}
-
-		// Initialize default title visibility for compartments in preference
-		// page.
-		for (final String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
-			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentNamesList() {
-		for (final String name : compartmentDefaultVisibilityMap.keySet()) {
-			this.compartmentNamesList.add(name);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeCompartmentTitlesList() {
-		for (final String name : compartmentTitleDefaultVisibilityMap.keySet()) {
-			this.compartmentTitlesList.add(name);
-		}
-	}
-
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java
index 8acac57ebc6..adee520419c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/part/CallBehaviorActionAsInteractionEditPart.java
@@ -24,7 +24,7 @@ import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.requests.ChangeBoundsRequest;

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

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

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.CallBehaviorActionEditPart;

 import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;

 import org.eclipse.papyrus.uml.diagram.interactionoverview.edit.commands.CreateSnapshotForInteractionFromRefreshCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
index 59b2a6439d1..26e8234590a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.component;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.composite;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index 37688ff2305..3c473271bda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.diagram.menu,
  org.eclipse.papyrus.uml.diagram.menu.actions,
  org.eclipse.papyrus.uml.diagram.menu.actions.handlers
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
index 37df65eace0..1644a3d5cc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
index 1d290092007..047e9b95cda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
@@ -1,97 +1,97 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.menu.handlers;
-
-import java.awt.Toolkit;
-import java.util.Collection;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.expressions.IEvaluationContext;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
-import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
-
-/**
- * The handler for the paste with model action
- *
- * @deprecated since February 2014 use org.eclipse.papyrus.infra.gmfdiag.menu.handlers.PasteInDiagramHandler
- */
-@Deprecated
-public class PasteWithModelHandler extends AbstractHandler {
-
-	/**
-	 * the paste command
-	 */
-	private ICommand pasteCommand = null;
-
-	/**
-	 * the target edit part
-	 */
-	private GraphicalEditPart targetEditPart = null;
-
-	/**
-	 *
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 *
-	 * @param event
-	 * @return
-	 * @throws ExecutionException
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if (pasteCommand != null && pasteCommand.canExecute()) {
-			targetEditPart.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pasteCommand));
-			RootEditPart topEditPart = targetEditPart.getRoot();
-			if (topEditPart.getChildren().get(0) instanceof DiagramEditPart) {
-				CleanDiagramHelper.getInstance().run((DiagramEditPart) topEditPart.getChildren().get(0));
-			}
-		}
-		return null;
-	}
-
-	/**
-	 *
-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
-	 *
-	 * @param evaluationContext
-	 */
-	@Override
-	public void setEnabled(Object evaluationContext) {
-		boolean enabled = false;
-		pasteCommand = null;
-		targetEditPart = null;
-		if (evaluationContext instanceof IEvaluationContext) {
-			Object defaultVariable = ((IEvaluationContext) evaluationContext).getDefaultVariable();
-			if (defaultVariable instanceof Collection<?>) {
-				int size = ((Collection<?>) defaultVariable).size();
-				if (size == 1) {
-					final Object current = ((Collection<?>) defaultVariable).iterator().next();
-					if (current instanceof GraphicalEditPart) {
-						targetEditPart = (GraphicalEditPart) current;
-						pasteCommand = PasteCommandService.getInstance().getPasteWithModelCommand(targetEditPart, Toolkit.getDefaultToolkit().getSystemClipboard(), targetEditPart.getEditingDomain().getClipboard());
-						enabled = pasteCommand != null && pasteCommand.canExecute();
-					}
-				}
-			}
-		}
-		setBaseEnabled(enabled);
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.menu.handlers;

+

+import java.awt.Toolkit;

+import java.util.Collection;

+

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

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

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

+import org.eclipse.core.expressions.IEvaluationContext;

+import org.eclipse.gef.RootEditPart;

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

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

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

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;

+import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;

+

+/**

+ * The handler for the paste with model action

+ *

+ * @deprecated since February 2014 use org.eclipse.papyrus.infra.gmfdiag.menu.handlers.PasteInDiagramHandler

+ */

+@Deprecated

+public class PasteWithModelHandler extends AbstractHandler {

+

+	/**

+	 * the paste command

+	 */

+	private ICommand pasteCommand = null;

+

+	/**

+	 * the target edit part

+	 */

+	private GraphicalEditPart targetEditPart = null;

+

+	/**

+	 *

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

+	 *

+	 * @param event

+	 * @return

+	 * @throws ExecutionException

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		if (pasteCommand != null && pasteCommand.canExecute()) {

+			targetEditPart.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pasteCommand));

+			RootEditPart topEditPart = targetEditPart.getRoot();

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

+				CleanDiagramHelper.getInstance().run((DiagramEditPart) topEditPart.getChildren().get(0));

+			}

+		}

+		return null;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

+	 *

+	 * @param evaluationContext

+	 */

+	@Override

+	public void setEnabled(Object evaluationContext) {

+		boolean enabled = false;

+		pasteCommand = null;

+		targetEditPart = null;

+		if (evaluationContext instanceof IEvaluationContext) {

+			Object defaultVariable = ((IEvaluationContext) evaluationContext).getDefaultVariable();

+			if (defaultVariable instanceof Collection<?>) {

+				int size = ((Collection<?>) defaultVariable).size();

+				if (size == 1) {

+					final Object current = ((Collection<?>) defaultVariable).iterator().next();

+					if (current instanceof GraphicalEditPart) {

+						targetEditPart = (GraphicalEditPart) current;

+						pasteCommand = PasteCommandService.getInstance().getPasteWithModelCommand(targetEditPart, Toolkit.getDefaultToolkit().getSystemClipboard(), targetEditPart.getEditingDomain().getClipboard());

+						enabled = pasteCommand != null && pasteCommand.canExecute();

+					}

+				}

+			}

+		}

+		setBaseEnabled(enabled);

+	}

+

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index 983b07eeeda..b185bc428f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
index d795329a311..16bbf5ec825 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.diagram.navigation
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
index 94a3d1da001..5a21a7f512b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.navigation</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.navigation</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
index be3a4187d2d..c2620fde5a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/META-INF/MANIFEST.MF
@@ -1,9 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
@@ -13,7 +12,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
index e30006d07ba..32e30a9839e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index 3d13131c96a..1f56a845919 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
  org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,
  org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,
@@ -12,7 +12,7 @@ Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
index 85f6a3e3c9f..db3241d8e28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.paletteconfiguration</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index ef1100330c7..9acd3513764 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -27,11 +27,11 @@ Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.services.validation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)",
@@ -39,10 +39,10 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
index 2a8d72dcb6d..207161cef75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-    <artifactId>org.eclipse.papyrus.uml.diagram.profile</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+    <artifactId>org.eclipse.papyrus.uml.diagram.profile</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index f664c8a9dde..ca555a96057 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -15,18 +15,18 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeCommentCreationEditPolicyEx.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeCommentCreationEditPolicyEx.java
index fcdee9fb386..ed28b6453b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeCommentCreationEditPolicyEx.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/AppliedStereotypeCommentCreationEditPolicyEx.java
@@ -22,7 +22,7 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.LayoutConstraint;

 import org.eclipse.gmf.runtime.notation.Node;

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

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CreateAppliedStereotypeCommentViewCommandEx;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomDurationConstraintEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java
index 766bc8d3d3d..0fc07e6813c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentHeadImpactLayoutEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java
index aacce943dde..f551ea19bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionHeadImpactLayoutEditPolicy.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.IdentityAnchor;
 import org.eclipse.gmf.runtime.notation.Location;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCommentItemSemanticEditPolicy.java
index 2f4e6726404..6eb463bcf73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCommentItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomConstraintItemSemanticEditPolicy.java
index f377335fdd6..3a0aa4c2e24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomConstraintItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomContextLinkCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomContinuationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomContinuationItemSemanticEditPolicy.java
index e4e7877194b..44e5894842a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomContinuationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomContinuationItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintInMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintInMessageItemSemanticEditPolicy.java
index ef2cc627fa5..f5a381404c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintInMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintInMessageItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintItemSemanticEditPolicy.java
index 00881c0c6d3..37f3d94efa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationConstraintItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationObservationItemSemanticEditPolicy.java
index 989b9f7a22b..f6dfdcc4078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomDurationObservationItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomGeneralOrderingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomGeneralOrderingItemSemanticEditPolicy.java
index 7b00cd39a57..336a365e031 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomGeneralOrderingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomGeneralOrderingItemSemanticEditPolicy.java
@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionUseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionUseItemSemanticEditPolicy.java
index a4d197b7765..70651fb6e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionUseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionUseItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomStateInvariantItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomStateInvariantItemSemanticEditPolicy.java
index 0893d09ae20..7d8bdbbc1ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomStateInvariantItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomStateInvariantItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeConstraintItemSemanticEditPolicy.java
index 6008134cdc9..eb53eb18159 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeConstraintItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeObservationItemSemanticEditPolicy.java
index 1f282a6c5a0..f81ad9e03fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomTimeObservationItemSemanticEditPolicy.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomMessage2CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java
index 00681e9c88d..e1a6b6b94d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomCombinedFragmentPreferencePage.java
@@ -91,19 +91,19 @@ public class CustomCombinedFragmentPreferencePage extends CombinedFragmentPrefer
 	protected void createPageContents(Composite parent) {

 		super.createPageContents(parent);

 		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);

-		addAbstractGroup(colorGroupForNodeComposite);

+		addPreferenceGroup(colorGroupForNodeComposite);

 		BackgroundColor backgroundColorGroup = new BackgroundColor(parent, getPreferenceKey(), this);

-		addAbstractGroup(backgroundColorGroup);

+		addPreferenceGroup(backgroundColorGroup);

 		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);

-		addAbstractGroup(decorationGroup);

+		addPreferenceGroup(decorationGroup);

 		if (!compartmentsList.isEmpty()) {

 			NodeCompartmentGroupEx compartmentGroup = new NodeCompartmentGroupEx(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());

-			addAbstractGroup(compartmentGroup);

+			addPreferenceGroup(compartmentGroup);

 		}

 		// Label role group

 		if (!getLabelRole().isEmpty()) {

 			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());

-			addAbstractGroup(compartmentGroup);

+			addPreferenceGroup(compartmentGroup);

 		}

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java
index 984a89a1da7..6beb770871f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomConsiderIgnoreFragmentPreferencePage.java
@@ -80,19 +80,19 @@ public class CustomConsiderIgnoreFragmentPreferencePage extends ConsiderIgnoreFr
 	protected void createPageContents(Composite parent) {

 		super.createPageContents(parent);

 		NodeColorGroup colorGroupForNodeComposite = new NodeColorGroup(parent, getPreferenceKey(), this);

-		addAbstractGroup(colorGroupForNodeComposite);

+		addPreferenceGroup(colorGroupForNodeComposite);

 		BackgroundColor backgroundColorGroup = new BackgroundColor(parent, getPreferenceKey(), this);

-		addAbstractGroup(backgroundColorGroup);

+		addPreferenceGroup(backgroundColorGroup);

 		DecorationGroup decorationGroup = new DecorationGroup(parent, getPreferenceKey(), this);

-		addAbstractGroup(decorationGroup);

+		addPreferenceGroup(decorationGroup);

 		if (!compartmentsList.isEmpty()) {

 			NodeCompartmentGroupEx compartmentGroup = new NodeCompartmentGroupEx(parent, getPreferenceKey(), this, compartmentsList, getCompartmentTitleVisibilityPreferences().keySet(), getPreferenceStore());

-			addAbstractGroup(compartmentGroup);

+			addPreferenceGroup(compartmentGroup);

 		}

 		// Label role group

 		if (!getLabelRole().isEmpty()) {

 			LabelGroup compartmentGroup = new LabelGroup(parent, getPreferenceKey(), this, getLabelRole());

-			addAbstractGroup(compartmentGroup);

+			addPreferenceGroup(compartmentGroup);

 		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java
index aa59079669d..570bbf599e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/providers/DurationConstraintContributionItem.java
@@ -16,8 +16,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.jface.action.ContributionItem;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCommentAnnotatedElementEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java
index 1a0698a3915..caa9626d244 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CombinedFragmentMoveHelper.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomCombinedFragmentEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
index f092e7f0b3d..4191c5f51da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/CommandHelper.java
@@ -43,7 +43,7 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.window.Window;

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

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

 import org.eclipse.papyrus.infra.ui.editor.CoreMultiDiagramEditor;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FixGateViewOnOpening.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FixGateViewOnOpening.java
index 692478fd555..c0acc189e94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FixGateViewOnOpening.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/FixGateViewOnOpening.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.Shape;

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

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CreateGateViewCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java
index b64bb35e452..2c7a2534a6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/GateHelper.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.DecorationNode;
 import org.eclipse.gmf.runtime.notation.NotationFactory;

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.util.MessageDirection;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateNameEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java
index 52f62fd1a0e..93e8dc9b65f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineCoveredByUpdater.java
@@ -35,7 +35,7 @@ import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

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

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.commands.PreserveAnchorsPositionCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CustomLifelineEditPart.PreserveAnchorsPositionCommandEx;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
index 3dc86657ce2..2a192efed5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java
@@ -61,7 +61,7 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

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

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
index 45c79b7b52f..bc183cfc72f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
index ea2abe2b39b..ce1abe95b45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
index b5b5c596849..846d9545ae0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
index 3063ce08806..5f3d486938c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
index 7c7214ceefd..3e751b19388 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index 747274ecf84..6264165af53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 342c495db52..3dd42e71e77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
index 06d695f64a4..77c00078370 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
@@ -12,7 +12,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
index ce90e63e018..e43100548c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
index 5dfb55ac246..9148cc95bc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index 761ffd49216..0d7c0b74c57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
index a3876be9705..ba0a9628d03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

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

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index d6074bddff9..ba481b104b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -32,12 +32,12 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.jface,
@@ -66,7 +66,7 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12
 Bundle-Vendor: %providerName
 Ant-Version: Apache Ant 1.7.0
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/EMFCustomTransitionRetargetContainerCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/EMFCustomTransitionRetargetContainerCommand.java
index f868663ef8f..fbdae4d46ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/EMFCustomTransitionRetargetContainerCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/EMFCustomTransitionRetargetContainerCommand.java
@@ -1,301 +1,301 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Pseudostate;
-import org.eclipse.uml2.uml.PseudostateKind;
-import org.eclipse.uml2.uml.Region;
-import org.eclipse.uml2.uml.State;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.Transition;
-import org.eclipse.uml2.uml.Vertex;
-
-/**
- * Customized transition-reorient command, takes changing of container into account.
- *
- * @author ansgar
- *
- */
-public class EMFCustomTransitionRetargetContainerCommand extends GMFUnsafe.UnsafeCommand {
-
-	protected Transition transition;
-
-	protected Region oldRegion;
-
-	protected Region newRegion;
-
-	public EMFCustomTransitionRetargetContainerCommand(Transition transition) {
-		super(TransactionUtil.getEditingDomain(transition));
-
-		this.transition = transition;
-	}
-
-
-	/**
-	 * change the container of a transition, if necessary
-	 */
-	public static boolean changeContainer(Transition transition) {
-		// now change container
-		Region region = deduceContainer(transition.getSource(), transition.getTarget());
-		if (region == null) {
-			return false; // transition is not valid
-		}
-		if (region != transition.getOwner()) {
-			region.getTransitions().add(transition); // will remove transition automatically from original region
-		}
-		return true;
-	}
-
-	/**
-	 * Check whether a transition from source to target is valid
-	 */
-	public static boolean isValid(EObject sourceE, EObject targetE) {
-		if (targetE == null) {
-			return true; // don't judge before knowing the target
-		}
-		NamedElement source = getNearestStateOrSM(sourceE);
-		NamedElement target = getNearestStateOrSM(targetE);
-		Region sourceRegion = getNearestRegion(source);
-		Region targetRegion = getNearestRegion(target);
-
-		if (isChild(source, targetRegion)) {
-			// transition starts from a composite state (or state-machine) to a vertex within this state
-			// assure that source is not an exit point
-			if (isExitPoint(sourceE)) {
-				return false; // source is an exit point, but target is within the inner part of a class (inverse condition)
-			}
-			if (isExitPoint(targetE)) {
-				return false; // standard condition
-			}
-			return true;
-		} else if (isChild(target, sourceRegion)) {
-			// transition from a vertex within the target points to target composite state (or state-machine)
-			// assure that target is not an entry point
-			if (isEntryPoint(sourceE)) {
-				return false; // standard condition
-			}
-			if (isEntryPoint(targetE)) {
-				return false; // source is an entry point, but target is outside the composite state
-
-			}
-			return true;
-		} else if (source == target) {
-			// source and target are on same state or state machine. Could be either an external or internal transition
-			// Allow transitions from entry to exit (internal) as well as from exit to entry (external)
-			// => only disallow from entry to entry and from exit to exit
-			if ((isEntryPoint(sourceE) && isEntryPoint(targetE)) || (isExitPoint(sourceE) && isExitPoint(targetE))) {
-				return false;
-			}
-			return true;
-		}
-
-		// standard conditions for external connections: start may not be a entry point, target not an exit point
-		if (isEntryPoint(sourceE)) {
-			return false;
-		}
-		if (isExitPoint(targetE)) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Calculate the container. Also checks whether a transition is possible
-	 *
-	 * @param sourceE
-	 * @param targetE
-	 * @return
-	 */
-	public static Region deduceContainer(EObject sourceE, EObject targetE) {
-		// Find container element for the new link.
-		NamedElement source = getNearestStateOrSM(sourceE);
-		if (targetE == null) {
-			// don't constraint until both source and target are given.
-			if (getNearestRegion(source) != null) {
-				return getNearestRegion(source);
-			} else {
-				return firstRegion(source);
-			}
-		}
-		NamedElement target = getNearestStateOrSM(targetE);
-		Region sourceRegion = getNearestRegion(source);
-		Region targetRegion = getNearestRegion(target);
-
-		if (isChild(source, targetRegion)) {
-			// transition starts from a composite state (or state-machine) to a vertex within this state
-			return childRegion(sourceRegion, source, targetRegion, target);
-		} else if (isChild(target, sourceRegion)) {
-			// transition from a vertex within the target points to target composite state (or state-machine)
-			return childRegion(targetRegion, target, sourceRegion, source);
-		} else if (source == target) {
-			// source and target are on same state or state machine. Could be either an external or internal transition
-			// Allow transitions from entry to exit (internal) as well as from exit to entry (external)
-			// => only disallow from entry to entry and from exit to exit
-			if (isEntryPoint(sourceE) || isExitPoint(targetE)) {
-				// is a local or internal transition, return first owned region
-				return firstRegion(source);
-			}
-			return sourceRegion;
-		}
-
-		if (isChild(targetRegion, sourceRegion)) {
-			// region of target state is a child of region of source state, choose the letter as "more global" region
-			// also include standard case, a transition between two states within same region
-			return targetRegion;
-		} else {
-			return sourceRegion;
-		}
-	}
-
-	public static Region childRegion(Region sourceRegion, NamedElement source, Region targetRegion, NamedElement target) {
-		// source state is parent of targetRegion => transition from composite state
-		// (or entry point of this state) to a target within composite
-		// need to choose a region of the state depending on target
-		EList<Region> regions = null;
-		if (source instanceof State) {
-			regions = ((State) source).getRegions();
-		} else if (source instanceof StateMachine) {
-			regions = ((StateMachine) source).getRegions();
-		}
-		if (regions != null) {
-			// should always be true, since we called getNearsetStateOrSM before
-			for (Region region : regions) {
-				if (isChild(region, targetRegion)) {
-					return region;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the first region of a state or statemachine.
-	 *
-	 * @param source
-	 * @return
-	 */
-	public static Region firstRegion(EObject source) {
-		EList<Region> regions = null;
-		if (source instanceof State) {
-			regions = ((State) source).getRegions();
-		} else if (source instanceof StateMachine) {
-			regions = ((StateMachine) source).getRegions();
-		}
-		if ((regions != null) && (regions.size() > 0)) {
-			return regions.get(0);
-		} else {
-			return null;
-		}
-	}
-
-	public static boolean isChild(EObject parent, EObject child) {
-		for (EObject element = child; element != null; element = element.eContainer()) {
-			if (element == parent) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isEntryPoint(EObject vertex) {
-		if (vertex instanceof Pseudostate) {
-			Pseudostate ps = (Pseudostate) vertex;
-			if (ps.getKind() == PseudostateKind.ENTRY_POINT_LITERAL) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isExitPoint(EObject vertex) {
-		if (vertex instanceof Pseudostate) {
-			Pseudostate ps = (Pseudostate) vertex;
-			if (ps.getKind() == PseudostateKind.EXIT_POINT_LITERAL) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Climb up by containment hierarchy starting from a given element
-	 * and return the first region (as in default policy)
-	 */
-	public static Region getNearestRegion(EObject startFrom) {
-		for (EObject element = startFrom; element != null; element = element.eContainer()) {
-			if (element instanceof Region) {
-				return (Region) element;
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * Returns the nearest state or statemachine, if the passed element is a pseudo-state.
-	 * This simplifies the calculation of a suitable container;
-	 *
-	 * @param vertex
-	 * @return Return type is named element, since state and region have no other common superclass
-	 */
-	public static NamedElement getNearestStateOrSM(EObject vertex) {
-		if (vertex instanceof Pseudostate) {
-			Pseudostate ps = (Pseudostate) vertex;
-			if ((ps.getKind() == PseudostateKind.ENTRY_POINT_LITERAL) || (ps.getKind() == PseudostateKind.EXIT_POINT_LITERAL)) {
-				State state = ps.getState();
-				if (state != null) {
-					return state;
-				}
-				StateMachine sm = ps.getStateMachine();
-				if (sm != null) {
-					return sm;
-				}
-			}
-		}
-		if (vertex instanceof Vertex) {
-			return (Vertex) vertex;
-		}
-		return null;
-	}
-
-	@Override
-	protected void doExecute() {
-		oldRegion = (Region) transition.getOwner();
-		changeContainer(transition);
-		newRegion = (Region) transition.getOwner();
-	}
-
-	@Override
-	protected void doUndo() {
-		if (oldRegion != transition.getOwner()) {
-			oldRegion.getTransitions().add(transition); // will remove transition automatically from original region
-		}
-	}
-
-	@Override
-	protected void doRedo() {
-		if (newRegion != transition.getOwner()) {
-			newRegion.getTransitions().add(transition); // will remove transition automatically from original region
-		}
-	}
-
-	@Override
-	protected boolean prepare() {
-		return true;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;

+

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

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

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Pseudostate;

+import org.eclipse.uml2.uml.PseudostateKind;

+import org.eclipse.uml2.uml.Region;

+import org.eclipse.uml2.uml.State;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.Transition;

+import org.eclipse.uml2.uml.Vertex;

+

+/**

+ * Customized transition-reorient command, takes changing of container into account.

+ *

+ * @author ansgar

+ *

+ */

+public class EMFCustomTransitionRetargetContainerCommand extends GMFUnsafe.UnsafeCommand {

+

+	protected Transition transition;

+

+	protected Region oldRegion;

+

+	protected Region newRegion;

+

+	public EMFCustomTransitionRetargetContainerCommand(Transition transition) {

+		super(TransactionUtil.getEditingDomain(transition));

+

+		this.transition = transition;

+	}

+

+

+	/**

+	 * change the container of a transition, if necessary

+	 */

+	public static boolean changeContainer(Transition transition) {

+		// now change container

+		Region region = deduceContainer(transition.getSource(), transition.getTarget());

+		if (region == null) {

+			return false; // transition is not valid

+		}

+		if (region != transition.getOwner()) {

+			region.getTransitions().add(transition); // will remove transition automatically from original region

+		}

+		return true;

+	}

+

+	/**

+	 * Check whether a transition from source to target is valid

+	 */

+	public static boolean isValid(EObject sourceE, EObject targetE) {

+		if (targetE == null) {

+			return true; // don't judge before knowing the target

+		}

+		NamedElement source = getNearestStateOrSM(sourceE);

+		NamedElement target = getNearestStateOrSM(targetE);

+		Region sourceRegion = getNearestRegion(source);

+		Region targetRegion = getNearestRegion(target);

+

+		if (isChild(source, targetRegion)) {

+			// transition starts from a composite state (or state-machine) to a vertex within this state

+			// assure that source is not an exit point

+			if (isExitPoint(sourceE)) {

+				return false; // source is an exit point, but target is within the inner part of a class (inverse condition)

+			}

+			if (isExitPoint(targetE)) {

+				return false; // standard condition

+			}

+			return true;

+		} else if (isChild(target, sourceRegion)) {

+			// transition from a vertex within the target points to target composite state (or state-machine)

+			// assure that target is not an entry point

+			if (isEntryPoint(sourceE)) {

+				return false; // standard condition

+			}

+			if (isEntryPoint(targetE)) {

+				return false; // source is an entry point, but target is outside the composite state

+

+			}

+			return true;

+		} else if (source == target) {

+			// source and target are on same state or state machine. Could be either an external or internal transition

+			// Allow transitions from entry to exit (internal) as well as from exit to entry (external)

+			// => only disallow from entry to entry and from exit to exit

+			if ((isEntryPoint(sourceE) && isEntryPoint(targetE)) || (isExitPoint(sourceE) && isExitPoint(targetE))) {

+				return false;

+			}

+			return true;

+		}

+

+		// standard conditions for external connections: start may not be a entry point, target not an exit point

+		if (isEntryPoint(sourceE)) {

+			return false;

+		}

+		if (isExitPoint(targetE)) {

+			return false;

+		}

+		return true;

+	}

+

+	/**

+	 * Calculate the container. Also checks whether a transition is possible

+	 *

+	 * @param sourceE

+	 * @param targetE

+	 * @return

+	 */

+	public static Region deduceContainer(EObject sourceE, EObject targetE) {

+		// Find container element for the new link.

+		NamedElement source = getNearestStateOrSM(sourceE);

+		if (targetE == null) {

+			// don't constraint until both source and target are given.

+			if (getNearestRegion(source) != null) {

+				return getNearestRegion(source);

+			} else {

+				return firstRegion(source);

+			}

+		}

+		NamedElement target = getNearestStateOrSM(targetE);

+		Region sourceRegion = getNearestRegion(source);

+		Region targetRegion = getNearestRegion(target);

+

+		if (isChild(source, targetRegion)) {

+			// transition starts from a composite state (or state-machine) to a vertex within this state

+			return childRegion(sourceRegion, source, targetRegion, target);

+		} else if (isChild(target, sourceRegion)) {

+			// transition from a vertex within the target points to target composite state (or state-machine)

+			return childRegion(targetRegion, target, sourceRegion, source);

+		} else if (source == target) {

+			// source and target are on same state or state machine. Could be either an external or internal transition

+			// Allow transitions from entry to exit (internal) as well as from exit to entry (external)

+			// => only disallow from entry to entry and from exit to exit

+			if (isEntryPoint(sourceE) || isExitPoint(targetE)) {

+				// is a local or internal transition, return first owned region

+				return firstRegion(source);

+			}

+			return sourceRegion;

+		}

+

+		if (isChild(targetRegion, sourceRegion)) {

+			// region of target state is a child of region of source state, choose the letter as "more global" region

+			// also include standard case, a transition between two states within same region

+			return targetRegion;

+		} else {

+			return sourceRegion;

+		}

+	}

+

+	public static Region childRegion(Region sourceRegion, NamedElement source, Region targetRegion, NamedElement target) {

+		// source state is parent of targetRegion => transition from composite state

+		// (or entry point of this state) to a target within composite

+		// need to choose a region of the state depending on target

+		EList<Region> regions = null;

+		if (source instanceof State) {

+			regions = ((State) source).getRegions();

+		} else if (source instanceof StateMachine) {

+			regions = ((StateMachine) source).getRegions();

+		}

+		if (regions != null) {

+			// should always be true, since we called getNearsetStateOrSM before

+			for (Region region : regions) {

+				if (isChild(region, targetRegion)) {

+					return region;

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Return the first region of a state or statemachine.

+	 *

+	 * @param source

+	 * @return

+	 */

+	public static Region firstRegion(EObject source) {

+		EList<Region> regions = null;

+		if (source instanceof State) {

+			regions = ((State) source).getRegions();

+		} else if (source instanceof StateMachine) {

+			regions = ((StateMachine) source).getRegions();

+		}

+		if ((regions != null) && (regions.size() > 0)) {

+			return regions.get(0);

+		} else {

+			return null;

+		}

+	}

+

+	public static boolean isChild(EObject parent, EObject child) {

+		for (EObject element = child; element != null; element = element.eContainer()) {

+			if (element == parent) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	public static boolean isEntryPoint(EObject vertex) {

+		if (vertex instanceof Pseudostate) {

+			Pseudostate ps = (Pseudostate) vertex;

+			if (ps.getKind() == PseudostateKind.ENTRY_POINT_LITERAL) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	public static boolean isExitPoint(EObject vertex) {

+		if (vertex instanceof Pseudostate) {

+			Pseudostate ps = (Pseudostate) vertex;

+			if (ps.getKind() == PseudostateKind.EXIT_POINT_LITERAL) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+

+	/**

+	 * Climb up by containment hierarchy starting from a given element

+	 * and return the first region (as in default policy)

+	 */

+	public static Region getNearestRegion(EObject startFrom) {

+		for (EObject element = startFrom; element != null; element = element.eContainer()) {

+			if (element instanceof Region) {

+				return (Region) element;

+			}

+		}

+		return null;

+	}

+

+

+	/**

+	 * Returns the nearest state or statemachine, if the passed element is a pseudo-state.

+	 * This simplifies the calculation of a suitable container;

+	 *

+	 * @param vertex

+	 * @return Return type is named element, since state and region have no other common superclass

+	 */

+	public static NamedElement getNearestStateOrSM(EObject vertex) {

+		if (vertex instanceof Pseudostate) {

+			Pseudostate ps = (Pseudostate) vertex;

+			if ((ps.getKind() == PseudostateKind.ENTRY_POINT_LITERAL) || (ps.getKind() == PseudostateKind.EXIT_POINT_LITERAL)) {

+				State state = ps.getState();

+				if (state != null) {

+					return state;

+				}

+				StateMachine sm = ps.getStateMachine();

+				if (sm != null) {

+					return sm;

+				}

+			}

+		}

+		if (vertex instanceof Vertex) {

+			return (Vertex) vertex;

+		}

+		return null;

+	}

+

+	@Override

+	protected void doExecute() {

+		oldRegion = (Region) transition.getOwner();

+		changeContainer(transition);

+		newRegion = (Region) transition.getOwner();

+	}

+

+	@Override

+	protected void doUndo() {

+		if (oldRegion != transition.getOwner()) {

+			oldRegion.getTransitions().add(transition); // will remove transition automatically from original region

+		}

+	}

+

+	@Override

+	protected void doRedo() {

+		if (newRegion != transition.getOwner()) {

+			newRegion.getTransitions().add(transition); // will remove transition automatically from original region

+		}

+	}

+

+	@Override

+	protected boolean prepare() {

+		return true;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/AbstractModifcationTriggerListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/AbstractModifcationTriggerListener.java
index d25818e87c4..f767d8c42c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/AbstractModifcationTriggerListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/AbstractModifcationTriggerListener.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.transaction.TriggerListener;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
index 9c9fc7391db..f57804b2ffe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomRegionCompartmentCreationEditPolicy.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomRegionCreateElementCommand;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.EMFCustomTransitionRetargetContainerCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
index 573a3ac891f..4097a33a4be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.statemachine</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.statemachine</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index ced63193132..15ce6e974f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,
  org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies,
  org.eclipse.papyrus.uml.diagram.stereotype.edition.internal.edithelper.advice;x-internal:=true,

  org.eclipse.papyrus.uml.diagram.stereotype.edition.provider
-Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",

+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",

  org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
index b40de5fa14c..d1a7166219b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.stereotype.edition</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.stereotype.edition</artifactId>

+	<version>2.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+</project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
index 46fafe0873d..ea64f537219 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols.properties/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.symbols;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 729ce2b67e4..92122eb8f4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
  org.eclipse.papyrus.uml.diagram.symbols.provider
-Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 78e69aa8e9c..78ebdc61396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -26,13 +26,13 @@ Bundle-Name: %pluginName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactStateInvariantEditPartCN.java
index 3a3489edfa2..d430f60171e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactStateInvariantEditPartCN.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.Messages;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands.CutAndInsertOccurrenceSpecificationCompactLifelineCommand;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.AbstractTimelineLayoutPolicy;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullStateInvariantEditPartCN.java
index d1342e18cd9..92d28c1ae04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullStateInvariantEditPartCN.java
@@ -30,7 +30,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

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

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.Messages;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.commands.CutAndInsertOccurrenceSpecificationCommand;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.AbstractTimelineLayoutPolicy;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 4b874cc0991..f2fb53fffea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -25,15 +25,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
@@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
index 9d06ef25f28..59c08baadef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/handler/ChangeShapeHandler.java
@@ -1,106 +1,106 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.usecase.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
-import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is an abstract class in charge to transform a editpart into another editpart
- *
- */
-public abstract class ChangeShapeHandler extends AbstractHandler {
-
-	protected TransactionalEditingDomain transactionalEditingDomain = null;
-
-	protected org.eclipse.uml2.uml.Element selectedElement = null;
-
-	public ChangeShapeHandler() {
-		super();
-	}
-
-	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);
-
-	/**
-	 *
-	 * @return null or the selected editPart
-	 */
-	protected GraphicalEditPart getSelectedGraphicalEditpart() {
-		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (activeWorkbenchWindow != null) {
-			ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();
-			ISelection selection = selectionService.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				Object selectedobject = ((IStructuredSelection) selection).getFirstElement();
-				if (selectedobject instanceof GraphicalEditPart) {
-					return (GraphicalEditPart) selectedobject;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();
-		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();
-		try {
-			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);
-		} catch (Exception e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Impossible to get the Transactional Editing Domain.", e);
-		}
-		try {
-			editPart.getEditingDomain().runExclusive(new Runnable() {
-
-				@Override
-				public void run() {
-					Display.getCurrent().asyncExec(new Runnable() {
-
-						@Override
-						public void run() {
-							AbstractTransactionalCommand command = getChangeShapeCommand(editPart);
-							Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
-							Command deleteCommand = editPart.getCommand(deleteViewRequest);
-							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape"); //$NON-NLS-1$
-							compoundCommand.append(new GMFtoEMFCommandWrapper(command));
-							compoundCommand.append(new GEFtoEMFCommandWrapper(deleteCommand));
-							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);
-						}
-					});
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.uml.diagram.usecase.handler;

+

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

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

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

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

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

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

+import org.eclipse.gef.requests.GroupRequest;

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

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

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

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

+import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

+import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

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

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * This class is an abstract class in charge to transform a editpart into another editpart

+ *

+ */

+public abstract class ChangeShapeHandler extends AbstractHandler {

+

+	protected TransactionalEditingDomain transactionalEditingDomain = null;

+

+	protected org.eclipse.uml2.uml.Element selectedElement = null;

+

+	public ChangeShapeHandler() {

+		super();

+	}

+

+	protected abstract AbstractTransactionalCommand getChangeShapeCommand(final GraphicalEditPart editPart);

+

+	/**

+	 *

+	 * @return null or the selected editPart

+	 */

+	protected GraphicalEditPart getSelectedGraphicalEditpart() {

+		IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

+		if (activeWorkbenchWindow != null) {

+			ISelectionService selectionService = activeWorkbenchWindow.getSelectionService();

+			ISelection selection = selectionService.getSelection();

+			if (selection instanceof IStructuredSelection) {

+				Object selectedobject = ((IStructuredSelection) selection).getFirstElement();

+				if (selectedobject instanceof GraphicalEditPart) {

+					return (GraphicalEditPart) selectedobject;

+				}

+			}

+		}

+		return null;

+	}

+

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		final GraphicalEditPart editPart = getSelectedGraphicalEditpart();

+		ServiceUtilsForEditPart util = ServiceUtilsForEditPart.getInstance();

+		try {

+			transactionalEditingDomain = util.getTransactionalEditingDomain(editPart);

+		} catch (Exception e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Impossible to get the Transactional Editing Domain.", e);

+		}

+		try {

+			editPart.getEditingDomain().runExclusive(new Runnable() {

+

+				@Override

+				public void run() {

+					Display.getCurrent().asyncExec(new Runnable() {

+

+						@Override

+						public void run() {

+							AbstractTransactionalCommand command = getChangeShapeCommand(editPart);

+							Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

+							Command deleteCommand = editPart.getCommand(deleteViewRequest);

+							org.eclipse.emf.common.command.CompoundCommand compoundCommand = new org.eclipse.emf.common.command.CompoundCommand("change Shape"); //$NON-NLS-1$

+							compoundCommand.append(new GMFtoEMFCommandWrapper(command));

+							compoundCommand.append(new GEFtoEMFCommandWrapper(deleteCommand));

+							editPart.getEditingDomain().getCommandStack().execute(compoundCommand);

+						}

+					});

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
index 2c172f54b23..5dcb699eff1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.usecase</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.usecase</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index 9123b2ac7ec..108992885c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -15,13 +15,13 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibilit
  org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %pluginProvider
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
index e5b54361899..6159ee572e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.diagram.wizards</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+	    <groupId>org.eclipse.papyrus</groupId>

+	    <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>

+	    <version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.uml.diagram.wizards</artifactId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file